From: Anton Khirnov Date: Wed, 17 Aug 2011 12:09:22 +0000 (+0200) Subject: avconv: merge two loops in output_packet(). X-Git-Tag: n0.9~1095^2~97 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=2886aee73f12f11e201f4c229d80eef549a43e1f;hp=f1176d41af9cd15164b8691e723d412c30da3777 avconv: merge two loops in output_packet(). --- diff --git a/avconv.c b/avconv.c index 18af625ce5..fe01dc6c08 100644 --- a/avconv.c +++ b/avconv.c @@ -1552,25 +1552,6 @@ static int output_packet(InputStream *ist, int ist_index, avpkt.size = 0; } -#if CONFIG_AVFILTER - if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { - for (i = 0; i < nb_ostreams; i++) { - ost = &ost_table[i]; - if (ost->input_video_filter && ost->source_index == ist_index) { - AVRational sar; - if (ist->st->sample_aspect_ratio.num) - sar = ist->st->sample_aspect_ratio; - else - sar = ist->st->codec->sample_aspect_ratio; - // add it to be filtered - av_vsrc_buffer_add_frame(ost->input_video_filter, &picture, - ist->pts, - sar); - } - } - } -#endif - // preprocess audio (volume) if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { if (audio_volume != 256) { @@ -1603,6 +1584,15 @@ static int output_packet(InputStream *ist, int ist_index, continue; #if CONFIG_AVFILTER + if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && + ost->input_video_filter) { + AVRational sar; + if (ist->st->sample_aspect_ratio.num) + sar = ist->st->sample_aspect_ratio; + else + sar = ist->st->codec->sample_aspect_ratio; + av_vsrc_buffer_add_frame(ost->input_video_filter, &picture, ist->pts, sar); + } frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]); while (frame_available) {