RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #1827, segfault with XXCH samples when downsampling. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Nick Brereton 2012-10-30 22:38:42 +00:00 committed by Michael Niedermayer
parent be0b37c649
commit 09ea482d5d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/dcadec.c
View File

@ -448,7 +448,6 @@ typedef struct {
int xxch_chset_nch[4];
float xxch_dmix_sf[DCA_CHSETS_MAX];
uint32_t xxch_downmix; /* downmix enabled per channel set */
uint32_t xxch_dmix_embedded; /* lower layer has mix pre-embedded, per chset */
float xxch_dmix_coeff[DCA_PRIM_CHANNELS_MAX][32]; /* worst case sizing */
@ -597,7 +596,6 @@ static int dca_parse_audio_coding_header(DCAContext *s, int base_channel,
s->xxch_dmix_sf[s->xxch_chset] = scale_factor;
for (i = base_channel; i < s->prim_channels; i++) {
s->xxch_downmix |= (1 << i);
mask[i] = get_bits(&s->gb, s->xxch_nbits_spk_mask);
}
@ -1905,7 +1903,6 @@ static int dca_xxch_decode_frame(DCAContext *s)
core_spk = get_bits(&s->gb, spkmsk_bits);
s->xxch_core_spkmask = core_spk;
s->xxch_nbits_spk_mask = spkmsk_bits;
s->xxch_downmix = 0;
s->xxch_dmix_embedded = 0;
/* skip to the end of the header */
@ -2268,7 +2265,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA;
}
s->xxch_downmix = 0;
s->xxch_dmix_embedded = 0;
} else {
/* we only get here if an XXCH channel set can be added to the mix */
channel_mask = s->xxch_core_spkmask;