ffmpeg | branch: master | Martin Vignali <martin.vign...@gmail.com> | Sat Nov 17 23:33:12 2018 +0100| [a970920026010bd9e03f99017c305212b889d4a5] | committer: Martin Vignali
avcodec/proresdec : move dsp init after codec tag check > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a970920026010bd9e03f99017c305212b889d4a5 --- 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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
