From d21f58b52d8c901487baa796d8568cb31b3b56ca Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Tue, 11 May 2010 17:25:18 +0000 Subject: cosmetics, rename loop to frame_available Originally committed as revision 23092 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index e1f8c8873e..a782a5c09f 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1521,7 +1521,7 @@ static int output_packet(AVInputStream *ist, int ist_index, AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; #if CONFIG_AVFILTER - int loop; + int frame_available; #endif AVPacket avpkt; @@ -1682,14 +1682,14 @@ static int output_packet(AVInputStream *ist, int ist_index, usleep(pts - now); } #if CONFIG_AVFILTER - loop = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || + 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 output time reached then transcode raw format, encode packets and output them */ if (start_time == 0 || ist->pts >= start_time) #if CONFIG_AVFILTER - while(loop) { + while (frame_available) { if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ist->out_video_filter) get_filtered_video_pic(ist->out_video_filter, &ist->picref, &picture, &ist->pts); #endif @@ -1782,7 +1782,7 @@ static int output_packet(AVInputStream *ist, int ist_index, } } #if CONFIG_AVFILTER - loop = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && + frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]); #endif } -- cgit v1.2.3