Skip to content

Commit 3f9b78b

Browse files
committed
avcodec/dnxhdenc: use BlockDSPContext from MpegEncContext
MpegEncContext already has a BlockDSPContext, so we don't need another one for DNXHDEncContext (which has an MpegEncContext).
1 parent 4f7aeff commit 3f9b78b

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

libavcodec/dnxhdenc.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
420420

421421
avctx->bits_per_raw_sample = ctx->bit_depth;
422422

423-
ff_blockdsp_init(&ctx->bdsp);
423+
ff_blockdsp_init(&ctx->m.bdsp);
424424
ff_fdctdsp_init(&ctx->m.fdsp, avctx);
425425
ff_mpv_idct_init(&ctx->m);
426426
ff_mpegvideoencdsp_init(&ctx->m.mpvencdsp, avctx);
@@ -768,10 +768,10 @@ void dnxhd_get_blocks(DNXHDEncContext *ctx, int mb_x, int mb_y)
768768
ptr_v + dct_uv_offset,
769769
uvlinesize);
770770
} else {
771-
ctx->bdsp.clear_block(ctx->blocks[4]);
772-
ctx->bdsp.clear_block(ctx->blocks[5]);
773-
ctx->bdsp.clear_block(ctx->blocks[6]);
774-
ctx->bdsp.clear_block(ctx->blocks[7]);
771+
ctx->m.bdsp.clear_block(ctx->blocks[4]);
772+
ctx->m.bdsp.clear_block(ctx->blocks[5]);
773+
ctx->m.bdsp.clear_block(ctx->blocks[6]);
774+
ctx->m.bdsp.clear_block(ctx->blocks[7]);
775775
}
776776
} else {
777777
pdsp->get_pixels(ctx->blocks[4],

libavcodec/dnxhdenc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ typedef struct RCEntry {
4343

4444
typedef struct DNXHDEncContext {
4545
AVClass *class;
46-
BlockDSPContext bdsp;
4746
MpegEncContext m; ///< Used for quantization dsp functions
4847

4948
int cid;

0 commit comments

Comments
 (0)