RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-14 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

Simplify av_close_input_file similarly to av_open_input_file previously

Browse Source 
Originally committed as revision 11254 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2007-12-17 19:12:43 +00:00
parent 17acc63a32
commit ca75a92325
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/utils.c
View File

@ -2041,7 +2041,7 @@ int av_read_pause(AVFormatContext *s)
void av_close_input_file(AVFormatContext *s) void av_close_input_file(AVFormatContext *s)
{ {
int i, must_open_file; int i;
AVStream *st; AVStream *st;
/* free previous packet */ /* free previous packet */
@ -2068,13 +2068,8 @@ void av_close_input_file(AVFormatContext *s)
av_freep(&s->programs[i]); av_freep(&s->programs[i]);
} }
flush_packet_queue(s); flush_packet_queue(s);
must_open_file = 1; if (!(s->iformat->flags & AVFMT_NOFILE))
if (s->iformat->flags & AVFMT_NOFILE) {
must_open_file = 0;
}
if (must_open_file) {
url_fclose(s->pb); url_fclose(s->pb);
}
av_freep(&s->priv_data); av_freep(&s->priv_data);
av_free(s); av_free(s);
} }