aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-05-11 17:25:18 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-05-11 17:25:18 +0000
commitd21f58b52d8c901487baa796d8568cb31b3b56ca (patch)
tree0f7413c92b42e5782491970abd4017ed16776184
parenta9f3cb9372593f3c4fc449a5e4de5cd0cb950996 (diff)
downloadffmpeg-d21f58b52d8c901487baa796d8568cb31b3b56ca.tar.gz
cosmetics, rename loop to frame_available
Originally committed as revision 23092 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c8
1 files changed, 4 insertions, 4 deletions
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
}