diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-05 01:46:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-05 01:46:14 +0100 |
| commit | 6ace8374bacf33e5f3407cb50e928e7533eb5e92 (patch) | |
| tree | 4f32b5abef0b42737d7f27e028f0ccb513cc2d01 /libavcodec/binkaudio.c | |
| parent | 8b1032c923af5b7360eac2cf8c1535256a5d4d92 (diff) | |
| parent | add7b1140fdd0651d0fc9352962631807126d3d0 (diff) | |
| download | ffmpeg-6ace8374bacf33e5f3407cb50e928e7533eb5e92.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
binkaudio: expand quant_table to accommodate all possible values
libx264: Set the default of the rc_lookahead option to -1
avcodec: Set flags2 default value depending on availability
configure: declare dependency of h264_vaapi_hwaccel on h264_decoder
Conflicts:
configure
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/binkaudio.c')
| -rw-r--r-- | libavcodec/binkaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index b1e4de2711..4f716824c7 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -39,7 +39,7 @@ extern const uint16_t ff_wma_critical_freqs[25]; -static float quant_table[95]; +static float quant_table[96]; #define MAX_CHANNELS 2 #define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11) @@ -112,7 +112,7 @@ static av_cold int decode_init(AVCodecContext *avctx) s->block_size = (s->frame_len - s->overlap_len) * s->channels; sample_rate_half = (sample_rate + 1) / 2; s->root = 2.0 / sqrt(s->frame_len); - for (i = 0; i < 95; i++) { + for (i = 0; i < 96; i++) { /* constant is result of 0.066399999/log10(M_E) */ quant_table[i] = expf(i * 0.15289164787221953823f) * s->root; } |