[FFmpeg-devel] [PATCH 2/3] avcodec/libx264: check for param allocation failure error code

[Carl Eugen Hoyos]

Am Fr., 10. Juli 2020 um 23:02 Uhr schrieb James Almer <jamrial at gmail.com>:
>
> And return the proper AVERROR value.
>
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  libavcodec/libx264.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
> index 4a82e1ba25..b39b89b565 100644
> --- a/libavcodec/libx264.c
> +++ b/libavcodec/libx264.c
> @@ -529,6 +529,12 @@ static int parse_opts(AVCodecContext *avctx, const char *opt, const char *param)
>              av_log(avctx, AV_LOG_ERROR,
>                     "bad option '%s': '%s'\n", opt, param);
>              ret = AVERROR(EINVAL);
> +#if X264_BUILD >= 161
> +        } else if (ret == X264_PARAM_ALLOC_FAILED) {

Why are these lines not merged?

> +            av_log(avctx, AV_LOG_ERROR,
> +                   "out of memory parsing option '%s': '%s'\n", opt, param);
> +            ret = AVERROR(ENOMEM);
> +#endif

Carl Eugen