diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2024-08-22 01:24:53 +0200 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2024-09-03 17:47:37 +0200 |
| commit | 3f9b78bd190e7f1d450a0db4dcd3158e8c7d4f89 (patch) | |
| tree | 543408182d524aa100315c5cb39e5f6c27696416 | |
| parent | 4f7aeffd8c3607aea6464a20eba4cc9106173c52 (diff) | |
| download | ffmpeg-3f9b78bd190e7f1d450a0db4dcd3158e8c7d4f89.tar.gz | |
avcodec/dnxhdenc: use BlockDSPContext from MpegEncContext
MpegEncContext already has a BlockDSPContext, so we don't need another
one for DNXHDEncContext (which has an MpegEncContext).
| -rw-r--r-- | libavcodec/dnxhdenc.c | 10 | ||||
| -rw-r--r-- | libavcodec/dnxhdenc.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 62612ef6d2..53e3669a30 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -420,7 +420,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) avctx->bits_per_raw_sample = ctx->bit_depth; - ff_blockdsp_init(&ctx->bdsp); + ff_blockdsp_init(&ctx->m.bdsp); ff_fdctdsp_init(&ctx->m.fdsp, avctx); ff_mpv_idct_init(&ctx->m); ff_mpegvideoencdsp_init(&ctx->m.mpvencdsp, avctx); @@ -768,10 +768,10 @@ void dnxhd_get_blocks(DNXHDEncContext *ctx, int mb_x, int mb_y) ptr_v + dct_uv_offset, uvlinesize); } else { - ctx->bdsp.clear_block(ctx->blocks[4]); - ctx->bdsp.clear_block(ctx->blocks[5]); - ctx->bdsp.clear_block(ctx->blocks[6]); - ctx->bdsp.clear_block(ctx->blocks[7]); + ctx->m.bdsp.clear_block(ctx->blocks[4]); + ctx->m.bdsp.clear_block(ctx->blocks[5]); + ctx->m.bdsp.clear_block(ctx->blocks[6]); + ctx->m.bdsp.clear_block(ctx->blocks[7]); } } else { pdsp->get_pixels(ctx->blocks[4], diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 72077d631d..00d486babd 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -43,7 +43,6 @@ typedef struct RCEntry { typedef struct DNXHDEncContext { AVClass *class; - BlockDSPContext bdsp; MpegEncContext m; ///< Used for quantization dsp functions int cid; |