Am Fr., 10. Juli 2020 um 23:02 Uhr schrieb James Almer <jamr...@gmail.com>:
>
> And return the proper AVERROR value.
>
> Signed-off-by: James Almer <jamr...@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
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
