From afb06aef7ebeaecd843d0af62dd32546245475c2 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 29 Jul 2024 13:59:35 -0300 Subject: [PATCH] avcodec/decode: remove unused argument from ff_frame_new_side_data_from_buf() Signed-off-by: James Almer --- libavcodec/av1dec.c | 2 +- libavcodec/decode.c | 2 +- libavcodec/decode.h | 2 +- libavcodec/hevc/hevcdec.c | 2 +- libavcodec/libdav1d.c | 2 +- libavcodec/libjxldec.c | 2 +- libavcodec/mpeg12dec.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index dd3c7f4734..1d5b9ef4f4 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -970,7 +970,7 @@ static int export_itut_t35(AVCodecContext *avctx, AVFrame *frame, if (!ret) break; - ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, &buf, NULL); + ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, &buf); if (ret < 0) return ret; diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 791940648d..c5873391d0 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1996,7 +1996,7 @@ finish: int ff_frame_new_side_data_from_buf(const AVCodecContext *avctx, AVFrame *frame, enum AVFrameSideDataType type, - AVBufferRef **buf, AVFrameSideData **psd) + AVBufferRef **buf) { return ff_frame_new_side_data_from_buf_ext(avctx, &frame->side_data, &frame->nb_side_data, diff --git a/libavcodec/decode.h b/libavcodec/decode.h index 72a775ff9d..2c3719a8d0 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -173,7 +173,7 @@ int ff_frame_new_side_data(const AVCodecContext *avctx, AVFrame *frame, */ int ff_frame_new_side_data_from_buf(const AVCodecContext *avctx, AVFrame *frame, enum AVFrameSideDataType type, - AVBufferRef **buf, AVFrameSideData **sd); + AVBufferRef **buf); /** * Same as `ff_frame_new_side_data_from_buf`, but taking a AVFrameSideData diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 526194eb80..193d624fc9 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -2871,7 +2871,7 @@ static int set_side_data(HEVCContext *s) if (!info_ref) return AVERROR(ENOMEM); - ret = ff_frame_new_side_data_from_buf(s->avctx, out, AV_FRAME_DATA_DYNAMIC_HDR_PLUS, &info_ref, NULL); + ret = ff_frame_new_side_data_from_buf(s->avctx, out, AV_FRAME_DATA_DYNAMIC_HDR_PLUS, &info_ref); if (ret < 0) return ret; } diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 09fe767fb8..546b42e9c6 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -528,7 +528,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) if (!res) break; - res = ff_frame_new_side_data_from_buf(c, frame, AV_FRAME_DATA_A53_CC, &buf, NULL); + res = ff_frame_new_side_data_from_buf(c, frame, AV_FRAME_DATA_A53_CC, &buf); if (res < 0) goto fail; diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index d57a27418f..9dfc261e3d 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -483,7 +483,7 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame) /* full image is one frame, even if animated */ av_log(avctx, AV_LOG_DEBUG, "FULL_IMAGE event emitted\n"); if (ctx->iccp) { - ret = ff_frame_new_side_data_from_buf(avctx, ctx->frame, AV_FRAME_DATA_ICC_PROFILE, &ctx->iccp, NULL); + ret = ff_frame_new_side_data_from_buf(avctx, ctx->frame, AV_FRAME_DATA_ICC_PROFILE, &ctx->iccp); if (ret < 0) return ret; } diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index bb0a769e49..4f784611de 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1307,7 +1307,7 @@ static int mpeg_field_start(Mpeg1Context *s1, const uint8_t *buf, int buf_size) if (s1->a53_buf_ref) { ret = ff_frame_new_side_data_from_buf( s->avctx, s->cur_pic.ptr->f, AV_FRAME_DATA_A53_CC, - &s1->a53_buf_ref, NULL); + &s1->a53_buf_ref); if (ret < 0) return ret; }