The branch, master has been updated via cb5dbb30caeb9b44897251892350f0e8297b9437 (commit) from 371931250a2b8d9cf2a726d4992f9107af3df782 (commit) - Log ----------------------------------------------------------------- commit cb5dbb30caeb9b44897251892350f0e8297b9437 Author: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> AuthorDate: Wed Sep 24 05:01:04 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> CommitDate: Thu Sep 25 06:47:30 2025 +0200 avcodec/tiff_common: Remove unused ff_tadd_*_metadata() funcs Unused since ad77345a5d14862f4701e5ad422b03b14934a5b9. Reviewed-by: Leo Izen <leo.izen@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> diff --git a/libavcodec/tiff_common.c b/libavcodec/tiff_common.c index ee8061944b..265f843031 100644 --- a/libavcodec/tiff_common.c +++ b/libavcodec/tiff_common.c @@ -97,51 +97,6 @@ static int bprint_to_avdict(AVBPrint *bp, const char *name, return av_dict_set(metadata, name, ap, AV_DICT_DONT_STRDUP_VAL); } -int ff_tadd_rational_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, AVDictionary **metadata) -{ - AVBPrint bp; - int32_t nom, denom; - int i; - - if (count >= INT_MAX / sizeof(int64_t) || count <= 0) - return AVERROR_INVALIDDATA; - if (bytestream2_get_bytes_left(gb) < count * sizeof(int64_t)) - return AVERROR_INVALIDDATA; - - av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED); - - for (i = 0; i < count; i++) { - nom = ff_tget_long(gb, le); - denom = ff_tget_long(gb, le); - av_bprintf(&bp, "%s%7"PRId32":%-7"PRId32, auto_sep(count, sep, i, 4), nom, denom); - } - - return bprint_to_avdict(&bp, name, metadata); -} - - -int ff_tadd_long_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, AVDictionary **metadata) -{ - AVBPrint bp; - int i; - - if (count >= INT_MAX / sizeof(int32_t) || count <= 0) - return AVERROR_INVALIDDATA; - if (bytestream2_get_bytes_left(gb) < count * sizeof(int32_t)) - return AVERROR_INVALIDDATA; - - av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED); - - for (i = 0; i < count; i++) { - av_bprintf(&bp, "%s%7i", auto_sep(count, sep, i, 8), ff_tget_long(gb, le)); - } - - return bprint_to_avdict(&bp, name, metadata); -} - - int ff_tadd_doubles_metadata(int count, const char *name, const char *sep, GetByteContext *gb, int le, AVDictionary **metadata) { @@ -184,28 +139,6 @@ int ff_tadd_shorts_metadata(int count, const char *name, const char *sep, return bprint_to_avdict(&bp, name, metadata); } - -int ff_tadd_bytes_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, int is_signed, AVDictionary **metadata) -{ - AVBPrint bp; - int i; - - if (count >= INT_MAX / sizeof(int8_t) || count < 0) - return AVERROR_INVALIDDATA; - if (bytestream2_get_bytes_left(gb) < count * sizeof(int8_t)) - return AVERROR_INVALIDDATA; - - av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED); - - for (i = 0; i < count; i++) { - int v = is_signed ? (int8_t)bytestream2_get_byte(gb) : bytestream2_get_byte(gb); - av_bprintf(&bp, "%s%3i", auto_sep(count, sep, i, 16), v); - } - - return bprint_to_avdict(&bp, name, metadata); -} - int ff_tadd_string_metadata(int count, const char *name, GetByteContext *gb, int le, AVDictionary **metadata) { diff --git a/libavcodec/tiff_common.h b/libavcodec/tiff_common.h index 11f2e739a4..67f23bd4fa 100644 --- a/libavcodec/tiff_common.h +++ b/libavcodec/tiff_common.h @@ -62,18 +62,6 @@ double ff_tget_double(GetByteContext *gb, int le); /** Reads a byte from the bytestream using given endianness. */ unsigned ff_tget(GetByteContext *gb, int type, int le); -/** Adds count rationals converted to a string - * into the metadata dictionary. - */ -int ff_tadd_rational_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, AVDictionary **metadata); - -/** Adds count longs converted to a string - * into the metadata dictionary. - */ -int ff_tadd_long_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, AVDictionary **metadata); - /** Adds count doubles converted to a string * into the metadata dictionary. */ @@ -86,12 +74,6 @@ int ff_tadd_doubles_metadata(int count, const char *name, const char *sep, int ff_tadd_shorts_metadata(int count, const char *name, const char *sep, GetByteContext *gb, int le, int is_signed, AVDictionary **metadata); -/** Adds count bytes converted to a string - * into the metadata dictionary. - */ -int ff_tadd_bytes_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, int is_signed, AVDictionary **metadata); - /** Adds a string of count characters * into the metadata dictionary. */ ----------------------------------------------------------------------- Summary of changes: libavcodec/tiff_common.c | 67 ------------------------------------------------ libavcodec/tiff_common.h | 18 ------------- 2 files changed, 85 deletions(-) hooks/post-receive --