diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:14:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:22:37 +0200 |
| commit | 7ae473e8a04f686bbeda75c40167c2df4211e662 (patch) | |
| tree | 073415316c09d2c86fcd41640f0bab7fddc8c4ed /libavcodec/imc.c | |
| parent | a80ce390df38b30f70012c9ce059129516664805 (diff) | |
| parent | cf22705e87b6f5015b5cbbf60b6ce9b818eb1900 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nuv: K&R formatting cosmetics
build: generalise rules and variable settings for av* programs
nuv: check RTjpeg header for validity
Revert "nuv: check per-frame header for validity."
imc: remove unused field IMCContext.one_div_log2
imc: fix size of a memset()
imc: remove empty if() block
fate: simplify variable setting filter.mak
lavf: Declare an AVRational struct without a struct literal
Conflicts:
Makefile
configure
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imc.c')
| -rw-r--r-- | libavcodec/imc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 2650bf7821..184c0c7263 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -92,7 +92,6 @@ typedef struct { float sqrt_tab[30]; GetBitContext gb; - float one_div_log2; DSPContext dsp; FFTContext fft; @@ -227,10 +226,6 @@ static av_cold int imc_decode_init(AVCodecContext *avctx) imc_huffman_bits[i][j], 2, 2, INIT_VLC_USE_NEW_STATIC); } } - q->one_div_log2 = 1 / log(2); - - if (avctx->codec_id == CODEC_ID_IAC) { - } if (avctx->codec_id == CODEC_ID_IAC) { iac_generate_tabs(q, avctx->sample_rate); @@ -792,7 +787,7 @@ static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch) chctx->decoder_reset = 1; if (chctx->decoder_reset) { - memset(q->out_samples, 0, sizeof(q->out_samples)); + memset(q->out_samples, 0, COEFFS * sizeof(*q->out_samples)); for (i = 0; i < BANDS; i++) chctx->old_floor[i] = 1.0; for (i = 0; i < COEFFS; i++) |