changeset 9541:7afd4f44c450 libavcodec

Display dimensions should not affect the real size of coded frame, thus set only avctx->{width,height} and don't touch coded_{width,height} when parsing them. This fixes the case when coded and display dimensions differ by more than one macroblock.
author kostya
date Thu, 23 Apr 2009 07:14:02 +0000
parents 479e4d868038
children c110790496ff
files vc1.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/vc1.c	Wed Apr 22 22:05:34 2009 +0000
+++ b/vc1.c	Thu Apr 23 07:14:02 2009 +0000
@@ -975,8 +975,8 @@
     if(get_bits1(gb)) { //Display Info - decoding is not affected by it
         int w, h, ar = 0;
         av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n");
-        v->s.avctx->coded_width  = w = get_bits(gb, 14) + 1;
-        v->s.avctx->coded_height = h = get_bits(gb, 14) + 1;
+        v->s.avctx->width  = w = get_bits(gb, 14) + 1;
+        v->s.avctx->height = h = get_bits(gb, 14) + 1;
         av_log(v->s.avctx, AV_LOG_DEBUG, "Display dimensions: %ix%i\n", w, h);
         if(get_bits1(gb))
             ar = get_bits(gb, 4);