aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-04-16 19:29:05 +0000
committerReinhard Tartler <siretart@tauware.de>2011-04-17 08:45:10 +0200
commit0b05864eef3d5323ee02515e3b62693230f7e4fb (patch)
tree8bbd12ea436c972e8e08c37adacee64259ef0be7
parent58bb6b7d9327eeed4d450e23c1316c439b6204a9 (diff)
downloadffmpeg-0b05864eef3d5323ee02515e3b62693230f7e4fb.tar.gz
vc1: fix fate-vc1 after previous commit.
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>
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 94fbffbc6b..6e73317451 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -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]);