aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-03-30 08:47:30 -0700
committerAnton Khirnov <anton@khirnov.net>2011-05-12 13:08:10 +0200
commit14cf9e698dac48cacd5e7f378469afcbf96cf507 (patch)
tree48c89513cabd61cf47632395bec606e3d33a8c10
parent304e983dc760176501b748ca99bcde23e7851013 (diff)
downloadffmpeg-14cf9e698dac48cacd5e7f378469afcbf96cf507.tar.gz
dnxhdenc: add AVClass in private context.
Fixes private options. Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/dnxhdenc.c4
-rw-r--r--libavcodec/dnxhdenc.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index e00b6f67a3..78da1c15e2 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -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");
diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h
index 83c0b1cacd..43f65e46dd 100644
--- a/libavcodec/dnxhdenc.h
+++ b/libavcodec/dnxhdenc.h
@@ -39,6 +39,7 @@ typedef struct {
} RCEntry;
typedef struct DNXHDEncContext {
+ AVClass *class;
MpegEncContext m; ///< Used for quantization dsp functions
AVFrame frame;