From fe425d97d124bcc3baa8e2f5ed5a1517fa0a8cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sat, 27 Sep 2025 02:36:33 +0200 Subject: [PATCH] avcodec/cbs*: remove redundant const, it's already in typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kacper Michajłow --- libavcodec/cbs.c | 14 +++++++------- libavcodec/cbs_apv.c | 2 +- libavcodec/cbs_av1.c | 2 +- libavcodec/cbs_h2645.c | 6 +++--- libavcodec/cbs_internal.h | 2 +- libavcodec/cbs_jpeg.c | 2 +- libavcodec/cbs_mpeg2.c | 2 +- libavcodec/cbs_vp8.c | 2 +- libavcodec/cbs_vp9.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 0f54c407f3..cea6e6db21 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -891,7 +891,7 @@ void CBS_FUNC(delete_unit)(CodedBitstreamFragment *frag, static void cbs_default_free_unit_content(AVRefStructOpaque opaque, void *content) { - const CodedBitstreamUnitTypeDescriptor *desc = opaque.c; + CodedBitstreamUnitTypeDescriptor *desc = opaque.c; for (int i = 0; i < desc->type.ref.nb_offsets; i++) { void **ptr = (void**)((char*)content + desc->type.ref.offsets[i]); @@ -899,11 +899,11 @@ static void cbs_default_free_unit_content(AVRefStructOpaque opaque, void *conten } } -static const CodedBitstreamUnitTypeDescriptor +static CodedBitstreamUnitTypeDescriptor *cbs_find_unit_type_desc(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit) { - const CodedBitstreamUnitTypeDescriptor *desc; + CodedBitstreamUnitTypeDescriptor *desc; int i, j; if (!ctx->codec->unit_types) @@ -927,7 +927,7 @@ static const CodedBitstreamUnitTypeDescriptor return NULL; } -static void *cbs_alloc_content(const CodedBitstreamUnitTypeDescriptor *desc) +static void *cbs_alloc_content(CodedBitstreamUnitTypeDescriptor *desc) { return av_refstruct_alloc_ext_c(desc->content_size, 0, (AVRefStructOpaque){ .c = desc }, @@ -939,7 +939,7 @@ static void *cbs_alloc_content(const CodedBitstreamUnitTypeDescriptor *desc) int CBS_FUNC(alloc_unit_content)(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit) { - const CodedBitstreamUnitTypeDescriptor *desc; + CodedBitstreamUnitTypeDescriptor *desc; av_assert0(!unit->content && !unit->content_ref); @@ -957,7 +957,7 @@ int CBS_FUNC(alloc_unit_content)(CodedBitstreamContext *ctx, static int cbs_clone_noncomplex_unit_content(void **clonep, const CodedBitstreamUnit *unit, - const CodedBitstreamUnitTypeDescriptor *desc) + CodedBitstreamUnitTypeDescriptor *desc) { const uint8_t *src; uint8_t *copy; @@ -1017,7 +1017,7 @@ fail: static int cbs_clone_unit_content(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit) { - const CodedBitstreamUnitTypeDescriptor *desc; + CodedBitstreamUnitTypeDescriptor *desc; void *new_content; int err; diff --git a/libavcodec/cbs_apv.c b/libavcodec/cbs_apv.c index fdc9042939..a1e546c92e 100644 --- a/libavcodec/cbs_apv.c +++ b/libavcodec/cbs_apv.c @@ -421,7 +421,7 @@ static void cbs_apv_free_metadata(AVRefStructOpaque unused, void *content) } } -static const CodedBitstreamUnitTypeDescriptor cbs_apv_unit_types[] = { +static CodedBitstreamUnitTypeDescriptor cbs_apv_unit_types[] = { { .nb_unit_types = CBS_UNIT_TYPE_RANGE, .unit_type.range = { diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 90e29ed0d8..75601c934b 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -1312,7 +1312,7 @@ static void cbs_av1_free_metadata(AVRefStructOpaque unused, void *content) } #endif -static const CodedBitstreamUnitTypeDescriptor cbs_av1_unit_types[] = { +static CodedBitstreamUnitTypeDescriptor cbs_av1_unit_types[] = { CBS_UNIT_TYPE_POD(AV1_OBU_SEQUENCE_HEADER, AV1RawOBU), CBS_UNIT_TYPE_POD(AV1_OBU_TEMPORAL_DELIMITER, AV1RawOBU), CBS_UNIT_TYPE_POD(AV1_OBU_FRAME_HEADER, AV1RawOBU), diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index f537686245..0dd256ada0 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1997,7 +1997,7 @@ static void cbs_h264_free_sei(AVRefStructOpaque unused, void *content) ff_cbs_sei_free_message_list(&sei->message_list); } -static const CodedBitstreamUnitTypeDescriptor cbs_h264_unit_types[] = { +static CodedBitstreamUnitTypeDescriptor cbs_h264_unit_types[] = { CBS_UNIT_TYPE_POD(H264_NAL_SPS, H264RawSPS), CBS_UNIT_TYPE_POD(H264_NAL_SPS_EXT, H264RawSPSExtension), @@ -2023,7 +2023,7 @@ static void cbs_h265_free_sei(AVRefStructOpaque unused, void *content) ff_cbs_sei_free_message_list(&sei->message_list); } -static const CodedBitstreamUnitTypeDescriptor cbs_h265_unit_types[] = { +static CodedBitstreamUnitTypeDescriptor cbs_h265_unit_types[] = { CBS_UNIT_TYPE_INTERNAL_REF(HEVC_NAL_VPS, H265RawVPS, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(HEVC_NAL_SPS, H265RawSPS, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(HEVC_NAL_PPS, H265RawPPS, extension_data.data), @@ -2060,7 +2060,7 @@ static void cbs_h266_free_sei(AVRefStructOpaque unused, void *content) ff_cbs_sei_free_message_list(&sei->message_list); } -static const CodedBitstreamUnitTypeDescriptor cbs_h266_unit_types[] = { +static CodedBitstreamUnitTypeDescriptor cbs_h266_unit_types[] = { CBS_UNIT_TYPE_INTERNAL_REF(VVC_DCI_NUT, H266RawDCI, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_OPI_NUT, H266RawOPI, extension_data.data), CBS_UNIT_TYPE_INTERNAL_REF(VVC_VPS_NUT, H266RawVPS, extension_data.data), diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h index 37398ef416..8ca53ff3ce 100644 --- a/libavcodec/cbs_internal.h +++ b/libavcodec/cbs_internal.h @@ -151,7 +151,7 @@ typedef struct CodedBitstreamType { // List of unit type descriptors for this codec. // Terminated by a descriptor with nb_unit_types equal to zero. - const CodedBitstreamUnitTypeDescriptor *unit_types; + CodedBitstreamUnitTypeDescriptor *unit_types; // Split frag->data into coded bitstream units, creating the // frag->units array. Fill data but not content on each unit. diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c index 406147c082..d64e2baec0 100644 --- a/libavcodec/cbs_jpeg.c +++ b/libavcodec/cbs_jpeg.c @@ -417,7 +417,7 @@ static int cbs_jpeg_assemble_fragment(CodedBitstreamContext *ctx, return 0; } -static const CodedBitstreamUnitTypeDescriptor cbs_jpeg_unit_types[] = { +static CodedBitstreamUnitTypeDescriptor cbs_jpeg_unit_types[] = { CBS_UNIT_RANGE_POD(JPEG_MARKER_SOF0, JPEG_MARKER_SOF3, JPEGRawFrameHeader), CBS_UNIT_RANGE_INTERNAL_REF(JPEG_MARKER_APPN, JPEG_MARKER_APPN + 15, diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 37fc28a4e6..87401d1543 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -397,7 +397,7 @@ static int cbs_mpeg2_assemble_fragment(CodedBitstreamContext *ctx, return 0; } -static const CodedBitstreamUnitTypeDescriptor cbs_mpeg2_unit_types[] = { +static CodedBitstreamUnitTypeDescriptor cbs_mpeg2_unit_types[] = { CBS_UNIT_TYPE_INTERNAL_REF(MPEG2_START_PICTURE, MPEG2RawPictureHeader, extra_information_picture.extra_information), diff --git a/libavcodec/cbs_vp8.c b/libavcodec/cbs_vp8.c index 1f80f34faf..7724cb3d7a 100644 --- a/libavcodec/cbs_vp8.c +++ b/libavcodec/cbs_vp8.c @@ -366,7 +366,7 @@ static int cbs_vp8_assemble_fragment(CodedBitstreamContext *ctx, return AVERROR_PATCHWELCOME; } -static const CodedBitstreamUnitTypeDescriptor cbs_vp8_unit_types[] = { +static CodedBitstreamUnitTypeDescriptor cbs_vp8_unit_types[] = { CBS_UNIT_TYPE_INTERNAL_REF(0, VP8RawFrame, data), CBS_UNIT_TYPE_END_OF_LIST, }; diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index 9a97b0532c..9e9b37e527 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -594,7 +594,7 @@ static av_cold void cbs_vp9_flush(CodedBitstreamContext *ctx) memset(vp9->ref, 0, sizeof(vp9->ref)); } -static const CodedBitstreamUnitTypeDescriptor cbs_vp9_unit_types[] = { +static CodedBitstreamUnitTypeDescriptor cbs_vp9_unit_types[] = { CBS_UNIT_TYPE_INTERNAL_REF(0, VP9RawFrame, data), CBS_UNIT_TYPE_END_OF_LIST };