Visible width/height fields were added in Theora 3.2

Originally committed as revision 15500 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 5 insertions, 4 deletions

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index b291cb1189..e01ceed237 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2078,8 +2078,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
         av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n");
     }
 
-    s->width = get_bits(gb, 16) << 4;
-    s->height = get_bits(gb, 16) << 4;
+    visible_width  = s->width  = get_bits(gb, 16) << 4;
+    visible_height = s->height = get_bits(gb, 16) << 4;
 
     if(avcodec_check_dimensions(avctx, s->width, s->height)){
         av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
@@ -2096,10 +2096,10 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
         skip_bits(gb, 32); /* total number of macroblocks in a frame */
     }
 
+    if (s->theora >= 0x030200) {
     visible_width  = get_bits_long(gb, 24);
     visible_height = get_bits_long(gb, 24);
 
-    if (s->theora >= 0x030200) {
         skip_bits(gb, 8); /* offset x */
         skip_bits(gb, 8); /* offset y */
     }
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index 5920e1cdcf..c5fac1db0c 100644
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -75,14 +75,15 @@ theora_header (AVFormatContext * s, int idx)
         if (version >= 0x030400)
             skip_bits(&gb, 100);
 
+        if (version >= 0x030200) {
         width  = get_bits_long(&gb, 24);
         height = get_bits_long(&gb, 24);
         if (   width  <= st->codec->width  && width  > st->codec->width-16
             && height <= st->codec->height && height > st->codec->height-16)
             avcodec_set_dimensions(st->codec, width, height);
 
-        if (version >= 0x030200)
             skip_bits(&gb, 16);
+        }
         st->codec->time_base.den = get_bits_long(&gb, 32);
         st->codec->time_base.num = get_bits_long(&gb, 32);
         st->time_base = st->codec->time_base;