Mercurial > libavcodec.hg

changeset 12459:b3f8dba49d1f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
VP3/Theora: validate aspect and reduce it before exporting it via the context.
author reimar
date Mon, 06 Sep 2010 17:53:29 +0000
parents 4a425a99f543
children 7106d2c8f142
files vp3.c
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 */