aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-03-30 08:47:30 -0700
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-03-30 08:48:08 -0700
commitd9699ea825304bfbc4bbf61d9fcdf97e74ff6361 (patch)
treedd14bfcd466d2492946369928226895ec5cb0fc4 /libavcodec
parentefdad9fbc777e6e27a524598c8f0ecf040a7b0c9 (diff)
downloadffmpeg-d9699ea825304bfbc4bbf61d9fcdf97e74ff6361.tar.gz
Fix dnxhd custom options, add AVClass in private context
Diffstat (limited to 'libavcodec')
-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 2e8720ac45..bd73290031 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 f0b38a5981..d2251d5b36 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;