From 9d11fedd1129565c8ba9e90b08b43e06f441b4fb Mon Sep 17 00:00:00 2001
From: James Darnley <jdarnley@obe.tv>
Date: Sat, 17 Jun 2017 03:13:36 +0200
Subject: [PATCH] avcodec/mdec: override IDCT choice before initing DSP structs
---
libavcodec/mdec.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index 8e28aa04f0f..97bfebbeb78 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -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;
--
GitLab