From df5913e95046e0e43d6d3299fed6d3f7454ad2c3 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Sat, 17 Nov 2018 23:33:12 +0100 Subject: [PATCH 03/11] avcodec/proresdec : move dsp init after codec tag check --- libavcodec/proresdec2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 130a4e3fe8..835df19418 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -53,15 +53,6 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->bits_per_raw_sample = 10; - ff_blockdsp_init(&ctx->bdsp, avctx); - ff_proresdsp_init(&ctx->prodsp, avctx); - - ff_init_scantable_permutation(idct_permutation, - ctx->prodsp.idct_permutation_type); - - permute(ctx->progressive_scan, ff_prores_progressive_scan, idct_permutation); - permute(ctx->interlaced_scan, ff_prores_interlaced_scan, idct_permutation); - switch (avctx->codec_tag) { case MKTAG('a','p','c','o'): avctx->profile = FF_PROFILE_PRORES_PROXY; @@ -86,6 +77,15 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_WARNING, "Unknown prores profile %d\n", avctx->codec_tag); } + ff_blockdsp_init(&ctx->bdsp, avctx); + ff_proresdsp_init(&ctx->prodsp, avctx); + + ff_init_scantable_permutation(idct_permutation, + ctx->prodsp.idct_permutation_type); + + permute(ctx->progressive_scan, ff_prores_progressive_scan, idct_permutation); + permute(ctx->interlaced_scan, ff_prores_interlaced_scan, idct_permutation); + return 0; } -- 2.14.3 (Apple Git-98)