diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2010-07-05 14:49:48 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2010-07-05 14:49:48 +0000 |
commit | 748db0fcc486417225d4cb45d7d5488a00dcc4e3 (patch) | |
tree | 91c8c1d6d5f222459744f0ceef7249962463f309 | |
parent | 3d5421201ba21d108adc0c76458300ea425114a9 (diff) | |
download | ffmpeg-748db0fcc486417225d4cb45d7d5488a00dcc4e3.tar.gz |
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
-rw-r--r-- | ffmpeg.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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); } |