From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 5 Jul 2010 14:49:48 +0000 (+0000)
Subject: Move frame_available computation to where it belongs in ffmpeg.c.
X-Git-Tag: v0.7b2~3648
X-Git-Url: https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=748db0fcc486417225d4cb45d7d5488a00dcc4e3;hp=3d5421201ba21d108adc0c76458300ea425114a9

Move frame_available computation to where it belongs in ffmpeg.c.
This fixes a infinite loop.
Fixes issue 2066.

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

diff --git a/ffmpeg.c b/ffmpeg.c
index 83680786c8..d5fd6a04bb 100644
--- 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);
         }