don't mark the delayed samples for upmixing if they haven't been downmixed

Originally committed as revision 14741 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Loren Merritt 2008-08-13 23:30:53 +00:00
parent 3b6516f7e7
commit 45d9d61889

View File

@ -1025,7 +1025,7 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
ac3_downmix(s, s->transform_coeffs+1);
}
if(!s->downmixed) {
if(downmix_output && !s->downmixed) {
s->downmixed = 1;
// FIXME delay[] is half the size of the other downmixes
ac3_downmix(s, s->delay);