1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-21 16:47:28 +02:00

Merge branch 'master' of git://git.ffmpeg.org/ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-03-12 17:55:59 +01:00
8 changed files with 180 additions and 138 deletions
-1
View File
@@ -520,7 +520,6 @@ static int ffmpeg_exit(int ret)
/* close files */
for(i=0;i<nb_output_files;i++) {
AVFormatContext *s = output_files[i];
int j;
if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
avio_close(s->pb);
avformat_free_context(s);