Merge commit '8136f234445862c94d1c081606b2d1e3d44fccf3'

[ffmpeg] / libavcodec / mss2.c

diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c
index 3de898b0997f130fccd382b1cfe19f16550f1334..d805c7ae73d37d233aae737af17a742dd8cf4ccb 100644 (file)
--- a/libavcodec/mss2.c
+++ b/libavcodec/mss2.c
@@ -760,9 +760,6 @@ static av_cold int wmv9_init(AVCodecContext *avctx)
     avctx->flags |= CODEC_FLAG_EMU_EDGE;
     v->s.flags   |= CODEC_FLAG_EMU_EDGE;
 
-    if (avctx->idct_algo == FF_IDCT_AUTO)
-        avctx->idct_algo = FF_IDCT_WMV2;
-
     if ((ret = ff_vc1_init_common(v)) < 0)
         return ret;
     ff_vc1dsp_init(&v->vc1dsp);