[FFmpeg-devel] [PATCH 5/5] wmalossless: silence a sample request

[Paul B Mahol]

On 4/30/16, Christophe Gisquet <christophe.gisquet at gmail.com> wrote:
> 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.
> ---
>  libavcodec/wmalosslessdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
> index f3a2217..83b3174 100644
> --- a/libavcodec/wmalosslessdec.c
> +++ b/libavcodec/wmalosslessdec.c
> @@ -469,7 +469,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",
> --
> 2.8.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

Applied, thanks.