summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-01-17 21:38:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-01-17 23:22:42 +0100
commitd9c3e5f6d8aab10a10f9f17fa3c0a207c45b2f54 (patch)
tree078a8aea6a748f876cb167e80b49b9cbcf4082dc /ffmpeg.c
parentab03382fee93e3a1d9423e9c2100b42d676eead9 (diff)
Feed the filter chain with the sample aspect ratio from the muxer or codec layer
like it has been done prior libavfilter.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 2f8cea1a36..bae4b806c5 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