提交 a9709200 编写于 作者: M Martin Vignali

avcodec/proresdec : move dsp init after codec tag check

上级 dae9b4b8
...@@ -53,15 +53,6 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -53,15 +53,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->bits_per_raw_sample = 10; 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) { switch (avctx->codec_tag) {
case MKTAG('a','p','c','o'): case MKTAG('a','p','c','o'):
avctx->profile = FF_PROFILE_PRORES_PROXY; avctx->profile = FF_PROFILE_PRORES_PROXY;
...@@ -86,6 +77,15 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -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); 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; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册