Re: [FFmpeg-devel] [PATCH] avcodec/imm4: improve decoding of some files

[Timo Rothenpieler]

> @@ -205,9 +206,26 @@ static int decode_blocks(AVCodecContext *avctx, GetBitContext *gb, > static int decode_intra(AVCodecContext *avctx, GetBitContext *gb, AVFrame *frame)

>  {
>      IMM4Context *s = avctx->priv_data;
> -    int ret, x, y;
> +    int ret, x, y, offset = 0;
>
> -    s->factor = intra_cb[s->sindex];
> +    if (s->hi == 0) {
> +        if (s->lo > 2)
> +            return AVERROR_INVALIDDATA;
> +        s->factor = intra_cb[s->lo];
> +    } else {
> +        if (s->hi == 1) {
> +            s->factor = s->lo * 2;
> +        } else {
> +            s->factor = s->lo * 2;
> +        }
> +    }

This if-branch does not look like it does what it's intended to do.


>                          AVFrame *frame, AVFrame *prev)
>  {
>      IMM4Context *s = avctx->priv_data;
> -    int ret, x, y;
> +    int ret, x, y, offset = 0;
>
> -    s->factor = inter_cb[s->sindex];
> +    if (s->hi == 0) {
> +        if (s->lo > 2)
> +            return AVERROR_INVALIDDATA;
> +        s->factor = inter_cb[s->lo];
> +    } else {
> +        if (s->hi == 1) {
> +            s->factor = s->lo * 2;
> +        } else {
> +            s->factor = s->lo * 2;
> +        }
> +    }

Same here

> @@ -244,9 +262,26 @@ static int decode_inter(AVCodecContext *avctx, GetBitContext *gb,

smime.p7s
Description: S/MIME Cryptographic Signature

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel