Merge commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84'

[ffmpeg] / libavcodec / xvididct.c

diff --git a/libavcodec/xvididct.c b/libavcodec/xvididct.c
index 36f65a6aafa593ab6808a592d4750dd3162c8203..8645af439a660c814df570ec4083e62b58ec1577 100644 (file)
--- a/libavcodec/xvididct.c
+++ b/libavcodec/xvididct.c
@@ -28,9 +28,11 @@ av_cold void ff_xvididct_init(IDCTDSPContext *c, AVCodecContext *avctx)
 
     if (high_bit_depth || avctx->lowres ||
         !(avctx->idct_algo == FF_IDCT_AUTO ||
-          avctx->idct_algo == FF_IDCT_XVIDMMX))
+          avctx->idct_algo == FF_IDCT_XVID))
         return;
 
     if (ARCH_X86)
         ff_xvididct_init_x86(c);
+
+    ff_init_scantable_permutation(c->idct_permutation, c->perm_type);
 }