diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:10:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:11:33 +0200 |
| commit | 69ea65b46f1a101f9a4f2c914c75b752122e7cbe (patch) | |
| tree | 19e9bfa95c01a5739802ddd1704e1486a6cbd4ad /libavcodec/twinvq.c | |
| parent | a0fb6083967afcd7f2c43ab3ff1e510912644daa (diff) | |
| parent | 3e5898782dce60334ab294821ca00b19c648cf66 (diff) | |
| download | ffmpeg-69ea65b46f1a101f9a4f2c914c75b752122e7cbe.tar.gz | |
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
Voxware MetaSound decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/twinvq.c')
| -rw-r--r-- | libavcodec/twinvq.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c index 3f5144a720..7c4f4997a2 100644 --- a/libavcodec/twinvq.c +++ b/libavcodec/twinvq.c @@ -686,6 +686,11 @@ static av_cold void init_bitstream_params(TwinVQContext *tctx) TWINVQ_WINDOW_TYPE_BITS + mtab->fmode[i].sub * (bse_bits[i] + n_ch * TWINVQ_SUB_GAIN_BITS); + if (tctx->codec == TWINVQ_CODEC_METASOUND) { + bsize_no_main_cb[1] += 2; + bsize_no_main_cb[2] += 2; + } + // The remaining bits are all used for the main spectrum coefficients for (i = 0; i < 4; i++) { int bit_size, vect_size; |