virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Move frame_available computation to where it belongs in ffmpeg.c.

Browse Source 
This fixes a infinite loop.
Fixes issue 2066.

Originally committed as revision 24058 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-07-05 14:49:48 +00:00
parent 3d5421201b
commit 748db0fcc4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg.c
View File

@ -1773,13 +1773,11 @@ static int output_packet(AVInputStream *ist, int ist_index,
av_free_packet(&opkt); 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 #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) if(ist->picref)
avfilter_unref_pic(ist->picref); avfilter_unref_pic(ist->picref);
} }