]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/mdec: override IDCT choice before initing DSP structs
authorJames Darnley <jdarnley@obe.tv>
Sat, 17 Jun 2017 01:13:36 +0000 (03:13 +0200)
committerJames Darnley <jdarnley@obe.tv>
Tue, 20 Jun 2017 11:59:51 +0000 (13:59 +0200)
libavcodec/mdec.c

index 8e28aa04f0fde49a4e3b71ff5de1c61fe22c7edb..97bfebbeb78bbedc109cf58cf87198e9eacecf03 100644 (file)
@@ -213,6 +213,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
 {
     MDECContext * const a = avctx->priv_data;
 
+    if (avctx->idct_algo == FF_IDCT_AUTO)
+        avctx->idct_algo = FF_IDCT_SIMPLE;
+
     a->mb_width  = (avctx->coded_width  + 15) / 16;
     a->mb_height = (avctx->coded_height + 15) / 16;
 
@@ -225,8 +228,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
     ff_init_scantable(a->idsp.idct_permutation, &a->scantable,
                       ff_zigzag_direct);
 
-    if (avctx->idct_algo == FF_IDCT_AUTO)
-        avctx->idct_algo = FF_IDCT_SIMPLE;
     avctx->pix_fmt  = AV_PIX_FMT_YUVJ420P;
     avctx->color_range = AVCOL_RANGE_JPEG;