]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '6652338f43ef623045912d7f28b61adea05d27ae'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 09:37:38 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 09:47:26 +0000 (11:47 +0200)
* commit '6652338f43ef623045912d7f28b61adea05d27ae':
  wmapro: return early on unsupported condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wmaprodec.c

index 580b7b454b7cf8efdcb942e5c52d2a87acaba57f..ce1f851c1b8d720a0a24134b534dc4ae3521cdff 100644 (file)
@@ -726,6 +726,7 @@ static int decode_channel_transform(WMAProDecodeCtx* s)
                     if (get_bits1(&s->gb)) {
                         avpriv_request_sample(s->avctx,
                                               "Unknown channel transform type");
+                        return AVERROR_PATCHWELCOME;
                     }
                 } else {
                     chgroup->transform = 1;