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

read 'coupling in use' parameter from bitstream into decoder context first,

Browse Source 
then copy to the local variable.

Originally committed as revision 14311 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-07-19 22:01:46 +00:00
parent 4f20b45fbe
commit 4760aec6a0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/ac3dec.c
View File

@ -753,8 +753,8 @@ static int ac3_parse_audio_block(AC3DecodeContext *s, int blk)
/* coupling strategy */ /* coupling strategy */
if (get_bits1(gbc)) { if (get_bits1(gbc)) {
memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS); memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
cpl_in_use = get_bits1(gbc); s->cpl_in_use[blk] = get_bits1(gbc);
if (cpl_in_use) { if (s->cpl_in_use[blk]) {
/* coupling in use */ /* coupling in use */
int cpl_begin_freq, cpl_end_freq; int cpl_begin_freq, cpl_end_freq;
@ -797,9 +797,9 @@ static int ac3_parse_audio_block(AC3DecodeContext *s, int blk)
av_log(s->avctx, AV_LOG_ERROR, "new coupling strategy must be present in block 0\n"); av_log(s->avctx, AV_LOG_ERROR, "new coupling strategy must be present in block 0\n");
return -1; return -1;
} else { } else {
cpl_in_use = s->cpl_in_use[blk-1]; s->cpl_in_use[blk] = s->cpl_in_use[blk-1];
} }
s->cpl_in_use[blk] = cpl_in_use; cpl_in_use = s->cpl_in_use[blk];
/* coupling coordinates */ /* coupling coordinates */
if (cpl_in_use) { if (cpl_in_use) {