diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2008-08-13 23:30:53 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2008-08-13 23:30:53 +0000 |
| commit | 45d9d61889874bf7d2f0babddb6778e71d71630e (patch) | |
| tree | f37bc6109616feaacf0eca57fcb040c252a5ee3c /libavcodec/ac3dec.c | |
| parent | 3b6516f7e7bb33b7aef9fa25adbf45f3de6c0560 (diff) | |
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
Diffstat (limited to 'libavcodec/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index d6f5d8a79b..4b288df84a 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -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); |