Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avcodec/dnxhdenc: use BlockDSPContext from MpegEncContext

Browse source 
MpegEncContext already has a BlockDSPContext, so we don't need another
one for DNXHDEncContext (which has an MpegEncContext).
This commit is contained in:
Ramiro Polla 2024-08-22 01:24:53 +02:00
parent 4f7aeffd8c
commit 3f9b78bd19
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libavcodec/dnxhdenc.c
View file

@ -420,7 +420,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
avctx->bits_per_raw_sample = ctx->bit_depth; 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_fdctdsp_init(&ctx->m.fdsp, avctx);
ff_mpv_idct_init(&ctx->m); ff_mpv_idct_init(&ctx->m);
ff_mpegvideoencdsp_init(&ctx->m.mpvencdsp, avctx); 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, ptr_v + dct_uv_offset,
uvlinesize); uvlinesize);
} else { } else {
ctx->bdsp.clear_block(ctx->blocks[4]); ctx->m.bdsp.clear_block(ctx->blocks[4]);
ctx->bdsp.clear_block(ctx->blocks[5]); ctx->m.bdsp.clear_block(ctx->blocks[5]);
ctx->bdsp.clear_block(ctx->blocks[6]); ctx->m.bdsp.clear_block(ctx->blocks[6]);
ctx->bdsp.clear_block(ctx->blocks[7]); ctx->m.bdsp.clear_block(ctx->blocks[7]);
} }
} else { } else {
pdsp->get_pixels(ctx->blocks[4], pdsp->get_pixels(ctx->blocks[4],

1
libavcodec/dnxhdenc.h
View file

@ -43,7 +43,6 @@ typedef struct RCEntry {
typedef struct DNXHDEncContext { typedef struct DNXHDEncContext {
AVClass *class; AVClass *class;
BlockDSPContext bdsp;
MpegEncContext m; ///< Used for quantization dsp functions MpegEncContext m; ///< Used for quantization dsp functions
int cid; int cid;