avcodec/decode: remove unused argument from ff_frame_new_side_data_from_buf()

James Almer committed 2 years ago

Commit afb06ae1 parent e7d3ff87 files · +7 −7Browse files

Unified · Split

7 files

libavcodec/av1dec.c +1 −1
libavcodec/decode.c +1 −1
libavcodec/decode.h +1 −1
libavcodec/hevc/hevcdec.c +1 −1
libavcodec/libdav1d.c +1 −1
libavcodec/libjxldec.c +1 −1
libavcodec/mpeg12dec.c +1 −1

libavcodec/av1dec.c+1−1

@@ -970,7 +970,7 @@ static int export_itut_t35(AVCodecContext avctx, AVFrame frame, · 969 unmodified lines
970	970	if (!ret)
971	971	break;
972	972
973		− ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, &buf, NULL);
	973	+ ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, &buf);
974	974	if (ret < 0)
975	975	return ret;
976	976

libavcodec/decode.c+1−1

@@ -1996,7 +1996,7 @@ finish: · 1995 unmodified lines
1996	1996
1997	1997	int ff_frame_new_side_data_from_buf(const AVCodecContext *avctx,
1998	1998	AVFrame *frame, enum AVFrameSideDataType type,
1999		− AVBufferRef buf, AVFrameSideData psd)
	1999	+ AVBufferRef **buf)
2000	2000	{
2001	2001	return ff_frame_new_side_data_from_buf_ext(avctx,
2002	2002	&frame->side_data, &frame->nb_side_data,

libavcodec/decode.h+1−1

@@ -173,7 +173,7 @@ int ff_frame_new_side_data(const AVCodecContext avctx, AVFrame frame, · 172 unmodified lines
173	173	*/
174	174	int ff_frame_new_side_data_from_buf(const AVCodecContext *avctx,
175	175	AVFrame *frame, enum AVFrameSideDataType type,
176		− AVBufferRef buf, AVFrameSideData sd);
	176	+ AVBufferRef **buf);
177	177
178	178	/**
179	179	* Same as `ff_frame_new_side_data_from_buf`, but taking a AVFrameSideData

libavcodec/hevc/hevcdec.c+1−1

@@ -2871,7 +2871,7 @@ static int set_side_data(HEVCContext *s) · 2870 unmodified lines
2871	2871	if (!info_ref)
2872	2872	return AVERROR(ENOMEM);
2873	2873
2874		− ret = ff_frame_new_side_data_from_buf(s->avctx, out, AV_FRAME_DATA_DYNAMIC_HDR_PLUS, &info_ref, NULL);
	2874	+ ret = ff_frame_new_side_data_from_buf(s->avctx, out, AV_FRAME_DATA_DYNAMIC_HDR_PLUS, &info_ref);
2875	2875	if (ret < 0)
2876	2876	return ret;
2877	2877	}

libavcodec/libdav1d.c+1−1

@@ -528,7 +528,7 @@ static int libdav1d_receive_frame(AVCodecContext c, AVFrame frame) · 527 unmodified lines
528	528	if (!res)
529	529	break;
530	530
531		− res = ff_frame_new_side_data_from_buf(c, frame, AV_FRAME_DATA_A53_CC, &buf, NULL);
	531	+ res = ff_frame_new_side_data_from_buf(c, frame, AV_FRAME_DATA_A53_CC, &buf);
532	532	if (res < 0)
533	533	goto fail;
534	534

libavcodec/libjxldec.c+1−1

@@ -483,7 +483,7 @@ static int libjxl_receive_frame(AVCodecContext avctx, AVFrame frame) · 482 unmodified lines
483	483	/* full image is one frame, even if animated */
484	484	av_log(avctx, AV_LOG_DEBUG, "FULL_IMAGE event emitted\n");
485	485	if (ctx->iccp) {
486		− ret = ff_frame_new_side_data_from_buf(avctx, ctx->frame, AV_FRAME_DATA_ICC_PROFILE, &ctx->iccp, NULL);
	486	+ ret = ff_frame_new_side_data_from_buf(avctx, ctx->frame, AV_FRAME_DATA_ICC_PROFILE, &ctx->iccp);
487	487	if (ret < 0)
488	488	return ret;
489	489	}

libavcodec/mpeg12dec.c+1−1

@@ -1307,7 +1307,7 @@ static int mpeg_field_start(Mpeg1Context s1, const uint8_t buf, int buf_size) · 1306 unmodified lines
1307	1307	if (s1->a53_buf_ref) {
1308	1308	ret = ff_frame_new_side_data_from_buf(
1309	1309	s->avctx, s->cur_pic.ptr->f, AV_FRAME_DATA_A53_CC,
1310		− &s1->a53_buf_ref, NULL);
	1310	+ &s1->a53_buf_ref);
1311	1311	if (ret < 0)
1312	1312	return ret;
1313	1313	}