[SCM] libav/experimental: Change an error to a warning to support broken AC-3 files known to exist. Fixes Issue 1426.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:52:16 UTC 2013


The following commit has been merged in the experimental branch:
commit 535497f193545614eeafe2a6644bfb486ced5b33
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Thu Oct 1 00:06:54 2009 +0000

    Change an error to a warning to support broken AC-3 files known to exist.
    Fixes Issue 1426.
    
    Originally committed as revision 20110 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 650468b..1ab17d7 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -941,8 +941,8 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
             for(bnd=0; bnd<s->num_rematrixing_bands; bnd++)
                 s->rematrixing_flags[bnd] = get_bits1(gbc);
         } else if (!blk) {
-            av_log(s->avctx, AV_LOG_ERROR, "new rematrixing strategy must be present in block 0\n");
-            return -1;
+            av_log(s->avctx, AV_LOG_WARNING, "Warning: new rematrixing strategy not present in block 0\n");
+            s->num_rematrixing_bands = 0;
         }
     }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list