vc1: fix fate-vc1 after previous commit.
authorRonald S. Bultje <rsbultje@gmail.com>
Sat, 16 Apr 2011 19:29:05 +0000 (19:29 +0000)
committerReinhard Tartler <siretart@tauware.de>
Sun, 17 Apr 2011 06:45:10 +0000 (08:45 +0200)
PROFILE_ADVANCED doesn't set res_fasttx, so make that a special case
in the condition that decides which IDCT to use (and whether to read
coefficients transposed or not).

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
libavcodec/vc1dec.c

index 94fbffb..6e73317 100644 (file)
@@ -3319,7 +3319,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
     s->mb_width = (avctx->coded_width+15)>>4;
     s->mb_height = (avctx->coded_height+15)>>4;
 
-    if (v->res_fasttx) {
+    if (v->profile == PROFILE_ADVANCED || v->res_fasttx) {
         for (i = 0; i < 64;  i++) {
 #define transpose(x) ((x>>3) | ((x&7)<<3))
             v->zz_8x8[0][i] = transpose(wmv1_scantable[0][i]);