[SCM] libav/experimental: Make wmaprodec.c:decode_init() return AVERROR_INVALIDDATA / AVERROR_PATCHWELCOME in case of invalid / unsupported number of channels specified, rather than return AVERROR_NOTSUPP.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c5c20ae4367905f0cf3080d46aa3bed3806134b9
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Thu Mar 25 21:01:35 2010 +0000

    Make wmaprodec.c:decode_init() return AVERROR_INVALIDDATA /
    AVERROR_PATCHWELCOME in case of invalid / unsupported number of
    channels specified, rather than return AVERROR_NOTSUPP.
    
    Originally committed as revision 22674 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 2a597b4..922b75b 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -343,9 +343,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
         }
     }
 
-    if (s->num_channels < 0 || s->num_channels > WMAPRO_MAX_CHANNELS) {
-        av_log_ask_for_sample(avctx, "invalid number of channels\n");
-        return AVERROR_NOTSUPP;
+    if (s->num_channels < 0) {
+        av_log(avctx, AV_LOG_ERROR, "invalid number of channels %d\n", s->num_channels);
+        return AVERROR_INVALIDDATA;
+    } else if (s->num_channels > WMAPRO_MAX_CHANNELS) {
+        av_log_ask_for_sample(avctx, "unsupported number of channels\n");
+        return AVERROR_PATCHWELCOME;
     }
 
     INIT_VLC_STATIC(&sf_vlc, SCALEVLCBITS, HUFF_SCALE_SIZE,

-- 
Libav/FFmpeg packaging