Merge commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d'

[ffmpeg] / libavcodec / mips / idctdsp_init_mips.c

diff --git a/libavcodec/mips/idctdsp_init_mips.c b/libavcodec/mips/idctdsp_init_mips.c
index 8c26bca538471a6c4138c6ed286c7b7788ccd728..bb33b5541986bb6ab9a2ccc26dd3c26d4e2ac369 100644 (file)
--- a/libavcodec/mips/idctdsp_init_mips.c
+++ b/libavcodec/mips/idctdsp_init_mips.c
@@ -20,6 +20,7 @@
  */
 
 #include "idctdsp_mips.h"
+#include "xvididct_mips.h"
 
 #if HAVE_MSA
 static av_cold void idctdsp_init_msa(IDCTDSPContext *c, AVCodecContext *avctx,
@@ -48,8 +49,10 @@ static av_cold void idctdsp_init_mmi(IDCTDSPContext *c, AVCodecContext *avctx,
     if ((avctx->lowres != 1) && (avctx->lowres != 2) && (avctx->lowres != 3) &&
         (avctx->bits_per_raw_sample != 10) &&
         (avctx->bits_per_raw_sample != 12) &&
-        (avctx->idct_algo == FF_IDCT_AUTO)) {
-                c->idct = ff_simple_idct_mmi;
+        ((avctx->idct_algo == FF_IDCT_AUTO) || (avctx->idct_algo == FF_IDCT_SIMPLE))) {
+                c->idct_put = ff_simple_idct_put_8_mmi;
+                c->idct_add = ff_simple_idct_add_8_mmi;
+                c->idct = ff_simple_idct_8_mmi;
                 c->perm_type = FF_IDCT_PERM_NONE;
     }