[FFmpeg-cvslog] r18665 - trunk/libavcodec/vc1.c

[kostya]

Author: kostya
Date: Thu Apr 23 09:14:02 2009
New Revision: 18665

Log:
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.

Modified:
   trunk/libavcodec/vc1.c

Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c	Thu Apr 23 00:05:34 2009	(r18664)
+++ trunk/libavcodec/vc1.c	Thu Apr 23 09:14:02 2009	(r18665)
@@ -975,8 +975,8 @@ static int decode_sequence_header_adv(VC
     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);