summaryrefslogtreecommitdiff
path: root/libavcodec/vc1.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-08-13 11:58:18 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-11 13:00:21 +0200
commit210d8f4ca23b97bcb34b18a92c6a66b243e86021 (patch)
treee2658941c7e583eb769418e327feee729684d1cf /libavcodec/vc1.c
parentcc4718196ad6cfe765fa1e8db0adef0e5bb09664 (diff)
downloadffmpeg-210d8f4ca23b97bcb34b18a92c6a66b243e86021.tar.gz
VC-1: fix reading of custom PAR.
Custom PAR num/denum are in 1-256 range. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Diego Biurrun <diego@biurrun.de> (cherry picked from commit 0e8696551414d4ea0aab2559f9475d1fe49d08f3) Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/vc1.c')
-rw-r--r--libavcodec/vc1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 32869b97d1..5e53680ec6 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -485,8 +485,8 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
if(ar && ar < 14){
v->s.avctx->sample_aspect_ratio = ff_vc1_pixel_aspect[ar];
}else if(ar == 15){
- w = get_bits(gb, 8);
- h = get_bits(gb, 8);
+ w = get_bits(gb, 8) + 1;
+ h = get_bits(gb, 8) + 1;
v->s.avctx->sample_aspect_ratio = (AVRational){w, h};
}
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);