Move frame_available computation to where it belongs in ffmpeg.c.
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jul 2010 14:49:48 +0000 (14:49 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jul 2010 14:49:48 +0000 (14:49 +0000)
This fixes a infinite loop.
Fixes issue 2066.

Originally committed as revision 24058 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 8368078..d5fd6a0 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1773,13 +1773,11 @@ static int output_packet(AVInputStream *ist, int ist_index,
                         av_free_packet(&opkt);
                     }
                 }
-#if CONFIG_AVFILTER
-                frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
-                        ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]);
-#endif
             }
 
 #if CONFIG_AVFILTER
+            frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
+                              ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]);
             if(ist->picref)
                 avfilter_unref_pic(ist->picref);
         }