aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2016-05-01 11:18:09 +0200
committerPaul B Mahol <onemda@gmail.com>2016-05-01 11:18:09 +0200
commit532e9370835d8afb7d20a86b652585b44ada627b (patch)
tree4aaa92361e2f0a93b26d48e0b2e6606dbc428644
parent8f4358888f373e21a47e079ce1ac3fc3a13f82cc (diff)
downloadffmpeg-532e9370835d8afb7d20a86b652585b44ada627b.tar.gz
avcodec/wmalosslessdec: silence a sample request
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>
-rw-r--r--libavcodec/wmalosslessdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 983c10aac4..f14e8a62f7 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -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",