diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-25 04:08:21 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-25 04:08:21 +0200 |
commit | 9ac154d1facd4756db6918f866dccf3e3ffb698c (patch) | |
tree | efd80c27d21d5e40cc9c24a6d8640ad005427d8b /libavcodec | |
parent | 9779b6262471d553c1ed811ff7312564e39d8adf (diff) | |
download | ffmpeg-9ac154d1facd4756db6918f866dccf3e3ffb698c.tar.gz |
avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3
Fixes Ticket5319
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/ac3dec.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 5d5330c4aa..f82f3974ef 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -895,11 +895,13 @@ static int decode_audio_block(AC3DecodeContext *s, int blk) ff_eac3_default_spx_band_struct, &s->num_spx_bands, s->spx_band_sizes); - } else { - for (ch = 1; ch <= fbw_channels; ch++) { - s->channel_uses_spx[ch] = 0; - s->first_spx_coords[ch] = 1; - } + } + } + if (!s->eac3 || !s->spx_in_use) { + s->spx_in_use = 0; + for (ch = 1; ch <= fbw_channels; ch++) { + s->channel_uses_spx[ch] = 0; + s->first_spx_coords[ch] = 1; } } |