avcodec/wmalosslessdec: silence a sample request
authorChristophe Gisquet <christophe.gisquet@gmail.com>
Sun, 1 May 2016 09:18:09 +0000 (11:18 +0200)
committerPaul B Mahol <onemda@gmail.com>
Sun, 1 May 2016 09:18:09 +0000 (11:18 +0200)
16bits samples with CDLMS orders of 8 are currently unsupported, but have never
been encountered before.

However, 8 seems to be the most frequent, if not the only order used for 24bits.
In that case, the dsp functions are fine with handling order that are multiples
of 8, so silence the warning.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/wmalosslessdec.c

index 983c10a..f14e8a6 100644 (file)
@@ -468,7 +468,7 @@ static int decode_cdlms(WmallDecodeCtx *s)
                 s->cdlms[0][0].order = 0;
                 return AVERROR_INVALIDDATA;
             }
-            if(s->cdlms[c][i].order & 8) {
+            if(s->cdlms[c][i].order & 8 && s->bits_per_sample == 16) {
                 static int warned;
                 if(!warned)
                     avpriv_request_sample(s->avctx, "CDLMS of order %d",