The ProresDSPContext already contains the idct_permutation.
Unified · Split
| @@ -133,7 +133,6 @@ static void unpack_alpha_12(GetBitContext *gb, uint16_t *dst, int num_coeffs, · 132 unmodified lines | |||
| 133 | static av_cold int decode_init(AVCodecContext *avctx) | 133 | static av_cold int decode_init(AVCodecContext *avctx) |
| 134 | { | 134 | { |
| 135 | ProresContext *ctx = avctx->priv_data; | 135 | ProresContext *ctx = avctx->priv_data; |
| 136 | uint8_t idct_permutation[64]; | ||
| 137 | 136 | ||
| 138 | avctx->bits_per_raw_sample = 10; | 137 | avctx->bits_per_raw_sample = 10; |
| 139 | 138 | ||
| @@ -173,11 +172,10 @@ static av_cold int decode_init(AVCodecContext *avctx) · 33 unmodified lines | |||
| 173 | ff_blockdsp_init(&ctx->bdsp); | 172 | ff_blockdsp_init(&ctx->bdsp); |
| 174 | ff_proresdsp_init(&ctx->prodsp, avctx->bits_per_raw_sample); | 173 | ff_proresdsp_init(&ctx->prodsp, avctx->bits_per_raw_sample); |
| 175 | 174 | ||
| 176 | ff_init_scantable_permutation(idct_permutation, | 175 | ff_permute_scantable(ctx->progressive_scan, ff_prores_progressive_scan, |
| 177 | ctx->prodsp.idct_permutation_type); | 176 | ctx->prodsp.idct_permutation); |
| 178 | 177 | ff_permute_scantable(ctx->interlaced_scan, ff_prores_interlaced_scan, | |
| 179 | ff_permute_scantable(ctx->progressive_scan, ff_prores_progressive_scan, idct_permutation); | 178 | ctx->prodsp.idct_permutation); |
| 180 | ff_permute_scantable(ctx->interlaced_scan, ff_prores_interlaced_scan, idct_permutation); | ||
| 181 | 179 | ||
| 182 | ctx->pix_fmt = AV_PIX_FMT_NONE; | 180 | ctx->pix_fmt = AV_PIX_FMT_NONE; |
| 183 | 181 | ||