[FFmpeg-cvslog] commit: Feed the filter chain with the sample aspect ratio from the muxer or codec layer (Michael Niedermayer )

[git at videolan.org]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 17 21:38:56 2011 +0100| [d9c3e5f6d8aab10a10f9f17fa3c0a207c45b2f54] | committer: Michael Niedermayer 

Feed the filter chain with the sample aspect ratio from the muxer or codec layer
like it has been done prior libavfilter.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9c3e5f6d8aab10a10f9f17fa3c0a207c45b2f54
---

 ffmpeg.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 2f8cea1..bae4b80 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1607,10 +1607,13 @@ static int output_packet(AVInputStream *ist, int ist_index,
 
 #if CONFIG_AVFILTER
         if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ist->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;
             // add it to be filtered
             av_vsrc_buffer_add_frame(ist->input_video_filter, &picture,
                                      ist->pts,
-                                     ist->st->codec->sample_aspect_ratio);
+                                     sar);
         }
 #endif