diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 22:20:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 22:20:28 +0200 |
| commit | 0dceefc5fa81a6c851b51acab695a8c149ec8e3b (patch) | |
| tree | d26bf3f752e6fa622d14f44e091930004b2d12de /libavcodec/vc1.c | |
| parent | 329898aa45f5f8e8b89386ecd40b8db96746d53c (diff) | |
| parent | 9e500efdbe0deeff1602500ebc229a0a6b6bb1a2 (diff) | |
| download | ffmpeg-0dceefc5fa81a6c851b51acab695a8c149ec8e3b.tar.gz | |
Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'
* commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2':
Add av_image_check_sar() and use it to validate SAR
Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/ffv1dec.c
libavcodec/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index c7f3561cbc..d23efecc16 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -471,6 +471,7 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) v->s.avctx->width * h, 1 << 30); } + ff_set_sar(v->s.avctx, v->s.avctx->sample_aspect_ratio); av_log(v->s.avctx, AV_LOG_DEBUG, "Aspect: %i:%i\n", v->s.avctx->sample_aspect_ratio.num, v->s.avctx->sample_aspect_ratio.den); |