Browse Source

Fix dnxhd custom options, add AVClass in private context

tags/n0.8
Baptiste Coudurier 14 years ago
parent
commit
d9699ea825
2 changed files with 3 additions and 2 deletions
  1. +2
    -2
      libavcodec/dnxhdenc.c
  2. +1
    -0
      libavcodec/dnxhdenc.h

+ 2
- 2
libavcodec/dnxhdenc.c View File

@@ -433,7 +433,7 @@ static int dnxhd_calc_bits_thread(AVCodecContext *avctx, void *arg, int jobnr, i
int n = dnxhd_switch_matrix(ctx, i);

memcpy(block, src_block, 64*sizeof(*block));
last_index = ctx->m.dct_quantize((MpegEncContext*)ctx, block, i, qscale, &overflow);
last_index = ctx->m.dct_quantize(&ctx->m, block, i, qscale, &overflow);
ac_bits += dnxhd_calc_ac_bits(ctx, block, last_index);

diff = block[0] - ctx->m.last_dc[n];
@@ -478,7 +478,7 @@ static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, int jobnr, int
DCTELEM *block = ctx->blocks[i];
int last_index, overflow;
int n = dnxhd_switch_matrix(ctx, i);
last_index = ctx->m.dct_quantize((MpegEncContext*)ctx, block, i, qscale, &overflow);
last_index = ctx->m.dct_quantize(&ctx->m, block, i, qscale, &overflow);
//START_TIMER;
dnxhd_encode_block(ctx, block, last_index, n);
//STOP_TIMER("encode_block");


+ 1
- 0
libavcodec/dnxhdenc.h View File

@@ -39,6 +39,7 @@ typedef struct {
} RCEntry;

typedef struct DNXHDEncContext {
AVClass *class;
MpegEncContext m; ///< Used for quantization dsp functions

AVFrame frame;


Loading…
Cancel
Save