[FFmpeg-devel] [PATCH 8/8] avcodec/smacker: Forward error codes

[Paul B Mahol]

lgtm

On 7/31/20, Andreas Rheinhardt <andreas.rheinhardt at gmail.com> wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> ---
>  libavcodec/smacker.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
> index 07fa8887d8..9ba70af6f7 100644
> --- a/libavcodec/smacker.c
> +++ b/libavcodec/smacker.c
> @@ -653,18 +653,15 @@ static int smka_decode_frame(AVCodecContext *avctx,
> void *data,
>              goto error;
>          }
>          skip_bits1(&gb);
> -        if (smacker_decode_tree(&gb, &h[i], 0, 0) < 0) {
> -            ret = AVERROR_INVALIDDATA;
> +        if ((ret = smacker_decode_tree(&gb, &h[i], 0, 0)) < 0)
>              goto error;
> -        }
>          skip_bits1(&gb);
>          if(h[i].current > 1) {
> -            res = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length,
> +            ret = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length,
>                      h[i].lengths, sizeof(int), sizeof(int),
>                      h[i].bits, sizeof(uint32_t), sizeof(uint32_t),
> INIT_VLC_LE);
> -            if(res < 0) {
> +            if (ret < 0) {
>                  av_log(avctx, AV_LOG_ERROR, "Cannot build VLC table\n");
> -                ret = AVERROR_INVALIDDATA;
>                  goto error;
>              }
>          }
> --
> 2.20.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".