# HG changeset patch # User reimar # Date 1283795609 0 # Node ID b3f8dba49d1f247431253450eb62ddd2b275fd27 # Parent 4a425a99f543763d894b098ff9232259eafc0f45 VP3/Theora: validate aspect and reduce it before exporting it via the context. diff -r 4a425a99f543 -r b3f8dba49d1f vp3.c --- a/vp3.c Sun Sep 05 21:04:11 2010 +0000 +++ b/vp3.c Mon Sep 06 17:53:29 2010 +0000 @@ -1965,7 +1965,7 @@ Vp3DecodeContext *s = avctx->priv_data; int visible_width, visible_height, colorspace; int offset_x = 0, offset_y = 0; - AVRational fps; + AVRational fps, aspect; s->theora = get_bits_long(gb, 24); av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora); @@ -2002,8 +2002,13 @@ fps.den, fps.num, 1<<30); } - avctx->sample_aspect_ratio.num = get_bits_long(gb, 24); - avctx->sample_aspect_ratio.den = get_bits_long(gb, 24); + aspect.num = get_bits_long(gb, 24); + aspect.den = get_bits_long(gb, 24); + if (aspect.num && aspect.den) { + av_reduce(&avctx->sample_aspect_ratio.num, + &avctx->sample_aspect_ratio.den, + aspect.num, aspect.den, 1<<30); + } if (s->theora < 0x030200) skip_bits(gb, 5); /* keyframe frequency force */