generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3

Browse Source 
Fixes Ticket5319

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-04-25 04:08:21 +02:00
parent 9779b62624
commit 9ac154d1fa
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ac3dec.c
View File

@ -895,13 +895,15 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
ff_eac3_default_spx_band_struct, ff_eac3_default_spx_band_struct,
&s->num_spx_bands, &s->num_spx_bands,
s->spx_band_sizes); s->spx_band_sizes);
} else { }
}
if (!s->eac3 || !s->spx_in_use) {
s->spx_in_use = 0;
for (ch = 1; ch <= fbw_channels; ch++) { for (ch = 1; ch <= fbw_channels; ch++) {
s->channel_uses_spx[ch] = 0; s->channel_uses_spx[ch] = 0;
s->first_spx_coords[ch] = 1; s->first_spx_coords[ch] = 1;
} }
} }
}
/* spectral extension coordinates */ /* spectral extension coordinates */
if (s->spx_in_use) { if (s->spx_in_use) {