[FFmpeg-devel] [PATCH] avcodec/hapqa_extract: fix two error return values

Martin Vignali martin.vignali at gmail.com
Wed Mar 14 01:17:59 EET 2018


2018-03-13 23:08 GMT+01:00 James Almer <jamrial at gmail.com>:

> ret is 0 by default.
>
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  libavcodec/hapqa_extract_bsf.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/libavcodec/hapqa_extract_bsf.c b/libavcodec/hapqa_extract_
> bsf.c
> index 333efb2e3a..ee5dc191f7 100644
> --- a/libavcodec/hapqa_extract_bsf.c
> +++ b/libavcodec/hapqa_extract_bsf.c
> @@ -66,6 +66,7 @@ static int hapqa_extract(AVBSFContext *bsf, AVPacket
> *pkt)
>
>      if ((section_type & 0x0F) != 0x0D) {
>          av_log(bsf, AV_LOG_ERROR, "Invalid section type for HAPQA
> %#04x.\n", section_type & 0x0F);
> +        ret = AVERROR_INVALIDDATA;
>          goto fail;
>      }
>
> @@ -90,6 +91,7 @@ static int hapqa_extract(AVBSFContext *bsf, AVPacket
> *pkt)
>
>          if (check_texture(ctx, section_type) == 0){ /* the second texture
> is not the one to keep */
>              av_log(bsf, AV_LOG_ERROR, "No valid texture found.\n");
> +            ret = AVERROR_INVALIDDATA;
>              goto fail;
>          }
>      }
> --


lgtm, thanks.

Martin


More information about the ffmpeg-devel mailing list