ac3dec: skip decoding and use error concealment for remaining blocks in

the frame after an error occurs.

Originally committed as revision 15987 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 3e8b0b5..208d87a 100644 (file)
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -1308,6 +1308,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
         const float *output[s->out_channels];
         if (!err && decode_audio_block(s, blk)) {
             av_log(avctx, AV_LOG_ERROR, "error decoding the audio block\n");
         const float *output[s->out_channels];
         if (!err && decode_audio_block(s, blk)) {
             av_log(avctx, AV_LOG_ERROR, "error decoding the audio block\n");

+            err = 1;

         }
         for (ch = 0; ch < s->out_channels; ch++)
             output[ch] = s->output[ch];
         }
         for (ch = 0; ch < s->out_channels; ch++)
             output[ch] = s->output[ch];