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

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index d6f5d8a..4b288df 100644 (file)
--- 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);