[SCM] libav/upstream.snapshot: wmapro: return early on unsupported condition

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Jul 13 06:29:05 UTC 2013


The following commit has been merged in the upstream.snapshot branch:
commit 9761abffb69d9cb24fc187ffb2900b039a1ffd5e
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Fri Jun 28 05:21:33 2013 +0200

    wmapro: return early on unsupported condition
    
    Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    CC: libav-stable at libav.org
    (cherry picked from commit 6652338f43ef623045912d7f28b61adea05d27ae)
    
    Signed-off-by: Reinhard Tartler <siretart at tauware.de>
    
    Conflicts:
    	libavcodec/wmaprodec.c

diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index eed38f6..57c22a4 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -722,6 +722,7 @@ static int decode_channel_transform(WMAProDecodeCtx* s)
                     if (get_bits1(&s->gb)) {
                         av_log_ask_for_sample(s->avctx,
                                               "unsupported channel transform type\n");
+                        return AVERROR_PATCHWELCOME;
                     }
                 } else {
                     chgroup->transform = 1;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list