[libav-devel] [PATCH 08/11] avconv: merge two loops in output_packet().

2011-08-17 Thread Anton Khirnov
---
 avconv.c |   28 +---
 1 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/avconv.c b/avconv.c
index 81315b6..8b92158 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1538,25 +1538,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) {
@@ -1589,6 +1570,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) {
-- 
1.7.5.4

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel


Re: [libav-devel] [PATCH 08/11] avconv: merge two loops in output_packet().

2011-08-17 Thread Kostya
On Wed, Aug 17, 2011 at 05:04:49PM +0200, Anton Khirnov wrote:
 ---
  avconv.c |   28 +---
  1 files changed, 9 insertions(+), 19 deletions(-)

looks OK
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel