[FFmpeg-cvslog] avcodec/libx264: check for param allocation failure error code
James Almer
git at videolan.org
Fri Jul 17 21:28:58 EEST 2020
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Jul 10 17:16:49 2020 -0300| [03ad76794e23bbbc2a9aafeef631efcc5f91435e] | committer: James Almer
avcodec/libx264: check for param allocation failure error code
And return the proper AVERROR value.
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03ad76794e23bbbc2a9aafeef631efcc5f91435e
---
libavcodec/libx264.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 4a82e1ba25..479dfe323c 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) {
+ av_log(avctx, AV_LOG_ERROR,
+ "out of memory parsing option '%s': '%s'\n", opt, param);
+ ret = AVERROR(ENOMEM);
+#endif
} else {
av_log(avctx, AV_LOG_ERROR,
"bad value for '%s': '%s'\n", opt, param);
@@ -914,10 +920,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
{
AVDictionaryEntry *en = NULL;
while (en = av_dict_get(x4->x264_params, "", en, AV_DICT_IGNORE_SUFFIX)) {
- if (x264_param_parse(&x4->params, en->key, en->value) < 0)
+ if ((ret = x264_param_parse(&x4->params, en->key, en->value)) < 0) {
av_log(avctx, AV_LOG_WARNING,
"Error parsing option '%s = %s'.\n",
en->key, en->value);
+#if X264_BUILD >= 161
+ if (ret == X264_PARAM_ALLOC_FAILED)
+ return AVERROR(ENOMEM);
+#endif
+ }
}
}
More information about the ffmpeg-cvslog
mailing list