generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetics, rename loop to frame_available

Browse Source 
Originally committed as revision 23092 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2010-05-11 17:25:18 +00:00
parent a9f3cb9372
commit d21f58b52d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg.c
View File

@ -1521,7 +1521,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
AVSubtitle subtitle, *subtitle_to_free; AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle; int got_subtitle;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
int loop; int frame_available;
#endif #endif
AVPacket avpkt; AVPacket avpkt;
@ -1682,14 +1682,14 @@ static int output_packet(AVInputStream *ist, int ist_index,
usleep(pts - now); usleep(pts - now);
} }
#if CONFIG_AVFILTER #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]); !ist->out_video_filter || avfilter_poll_frame(ist->out_video_filter->inputs[0]);
#endif #endif
/* if output time reached then transcode raw format, /* if output time reached then transcode raw format,
encode packets and output them */ encode packets and output them */
if (start_time == 0 || ist->pts >= start_time) if (start_time == 0 || ist->pts >= start_time)
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
while(loop) { while (frame_available) {
if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ist->out_video_filter) 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); get_filtered_video_pic(ist->out_video_filter, &ist->picref, &picture, &ist->pts);
#endif #endif
@ -1782,7 +1782,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
} }
} }
#if CONFIG_AVFILTER #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]); ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]);
#endif #endif
} }