[FFmpeg-cvslog] avcodec/wmalosslessdec: silence a sample request

Christophe Gisquet git at videolan.org
Sun May 1 11:18:56 CEST 2016


ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet at gmail.com> | Sun May  1 11:18:09 2016 +0200| [532e9370835d8afb7d20a86b652585b44ada627b] | committer: Paul B Mahol

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=532e9370835d8afb7d20a86b652585b44ada627b
---

 libavcodec/wmalosslessdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 983c10a..f14e8a6 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",



More information about the ffmpeg-cvslog mailing list