ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Fri Mar 22 14:25:44 2024 +0100| [b9fcc135c570e254b8cb8d63c50877646bf97e40] | committer: Andreas Rheinhardt
avcodec/libx265: Pass logctx as void*, not AVClass** The latter need not be save, because av_log() expects to get a pointer to an AVClass-enabled structure and not only a fake object. If this function were actually be called in the following way: const AVClass *avcl = avctx->av_class; handle_mdcv(&avcl, ); the AVClass's item_name would expect to point to an actual AVCodecContext, potentially leading to a segfault. Reviewed-by: Jan Ekström <jee...@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9fcc135c570e254b8cb8d63c50877646bf97e40 --- libavcodec/libx265.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index d7620878b8..45349a85b9 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -175,7 +175,7 @@ static av_cold int libx265_param_parse_int(AVCodecContext *avctx, return 0; } -static int handle_mdcv(const AVClass **avcl, const x265_api *api, +static int handle_mdcv(void *logctx, const x265_api *api, x265_param *params, const AVMasteringDisplayMetadata *mdcv) { @@ -198,7 +198,7 @@ static int handle_mdcv(const AVClass **avcl, const x265_api *api, if (api->param_parse(params, "master-display", buf) == X265_PARAM_BAD_VALUE) { - av_log(avcl, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Invalid value \"%s\" for param \"master-display\".\n", buf); return AVERROR(EINVAL); @@ -230,7 +230,7 @@ static int handle_side_data(AVCodecContext *avctx, const x265_api *api, if (mdcv_sd) { int ret = handle_mdcv( - &avctx->av_class, api, params, + avctx, api, params, (AVMasteringDisplayMetadata *)mdcv_sd->data); if (ret < 0) return ret; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
