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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 0 insertions, 1 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 3c51079ef1..45b819824d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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);