diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:28:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:28:31 +0100 |
| commit | ac021fdc40631f77a727f076f8748f89109c785b (patch) | |
| tree | a51ba691da5f29c81d3ea61848b2938236f88ec2 /libavcodec/twinvq.c | |
| parent | 0290a646ac662a8552dfdb2de4887cac7a79acd1 (diff) | |
| parent | 56d061ce9da954560892e3551513d5ecc0439846 (diff) | |
| download | ffmpeg-ac021fdc40631f77a727f076f8748f89109c785b.tar.gz | |
Merge commit '56d061ce9da954560892e3551513d5ecc0439846'
* commit '56d061ce9da954560892e3551513d5ecc0439846':
metasound: add last missing modes (8kHz @ 6kbps per channel)
Conflicts:
Changelog
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/twinvq.c')
| -rw-r--r-- | libavcodec/twinvq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c index 31fefa4cf9..08a7a9f4e8 100644 --- a/libavcodec/twinvq.c +++ b/libavcodec/twinvq.c @@ -704,7 +704,7 @@ 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) { + if (tctx->codec == TWINVQ_CODEC_METASOUND && !tctx->is_6kbps) { bsize_no_main_cb[1] += 2; bsize_no_main_cb[2] += 2; } |