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/twinvqdec.c | |
| parent | 0290a646ac662a8552dfdb2de4887cac7a79acd1 (diff) | |
| parent | 56d061ce9da954560892e3551513d5ecc0439846 (diff) | |
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/twinvqdec.c')
| -rw-r--r-- | libavcodec/twinvqdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index 9fce3c39cf..67ce031391 100644 --- a/libavcodec/twinvqdec.c +++ b/libavcodec/twinvqdec.c @@ -402,6 +402,7 @@ static av_cold int twinvq_decode_init(AVCodecContext *avctx) tctx->decode_ppc = decode_ppc; tctx->frame_size = avctx->bit_rate * tctx->mtab->size / avctx->sample_rate + 8; + tctx->is_6kbps = 0; if (avctx->block_align && avctx->block_align * 8 / tctx->frame_size > 1) { av_log(avctx, AV_LOG_ERROR, "VQF TwinVQ should have only one frame per packet\n"); |