# HG changeset patch # User stefano # Date 1269550895 0 # Node ID 6e1a61e42561e8330b48e7c86efed6060b0210ab # Parent afe2ac7b175cdfe4f3d1278027880e55a43c5d34 Make wmaprodec.c:decode_init() return AVERROR_INVALIDDATA / AVERROR_PATCHWELCOME in case of invalid / unsupported number of channels specified, rather than return AVERROR_NOTSUPP. diff -r afe2ac7b175c -r 6e1a61e42561 wmaprodec.c --- a/wmaprodec.c Thu Mar 25 19:39:06 2010 +0000 +++ b/wmaprodec.c Thu Mar 25 21:01:35 2010 +0000 @@ -343,9 +343,12 @@ } } - 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,