Commit 748db0fc authored by Michael Niedermayer's avatar Michael Niedermayer

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
parent 3d542120
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment