[FFmpeg-cvslog] r24058 - trunk/ffmpeg.c

[michael]

Author: michael
Date: Mon Jul  5 16:49:48 2010
New Revision: 24058

Log:
Move frame_available computation to where it belongs in ffmpeg.c.
This fixes a infinite loop.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Jul  5 16:36:03 2010	(r24057)
+++ trunk/ffmpeg.c	Mon Jul  5 16:49:48 2010	(r24058)
@@ -1773,13 +1773,11 @@ static int output_packet(AVInputStream *
                         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);
         }