The branch, master has been updated
via 45dcfb2d6039c2f40f1d54d01219526cad8633d4 (commit)
from a66a260ae9da037b1f14ad4d110de3bceb5b42e9 (commit)
- Log -----------------------------------------------------------------
commit 45dcfb2d6039c2f40f1d54d01219526cad8633d4
Author: James Almer <[email protected]>
AuthorDate: Mon Sep 1 11:00:44 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Mon Sep 1 11:00:44 2025 -0300
avcodec/version_major: remove unnecessary define for an internal function
It being avpriv and not public, it can be removed in the next bump
regardless of when it
happens.
Signed-off-by: James Almer <[email protected]>
diff --git a/libavcodec/exif.c b/libavcodec/exif.c
index 2ac54e51af..69e77cd976 100644
--- a/libavcodec/exif.c
+++ b/libavcodec/exif.c
@@ -909,7 +909,7 @@ int av_exif_ifd_to_dict(void *logctx, const AVExifMetadata
*ifd, AVDictionary **
return exif_ifd_to_dict(logctx, "", ifd, metadata);
}
-#if FF_API_OLD_EXIF
+#if LIBAVCODEC_VERSION_MAJOR < 63
int avpriv_exif_decode_ifd(void *logctx, const uint8_t *buf, int size,
int le, int depth, AVDictionary **metadata)
{
@@ -924,7 +924,7 @@ int avpriv_exif_decode_ifd(void *logctx, const uint8_t
*buf, int size,
av_exif_free(&ifd);
return ret;
}
-#endif /* FF_API_OLD_EXIF */
+#endif
#define EXIF_COPY(fname, srcname) do { \
size_t sz; \
diff --git a/libavcodec/exif_internal.h b/libavcodec/exif_internal.h
index 565e747353..ad5260d329 100644
--- a/libavcodec/exif_internal.h
+++ b/libavcodec/exif_internal.h
@@ -36,11 +36,11 @@
#include "exif.h"
#include "version_major.h"
-#if FF_API_OLD_EXIF
+#if LIBAVCODEC_VERSION_MAJOR < 63
/* Used by the AVI demuxer */
int avpriv_exif_decode_ifd(void *logctx, const uint8_t *buf, int size,
int le, int depth, AVDictionary **metadata);
-#endif /* FF_API_OLD_EXIF */
+#endif
#define MAKERNOTE_TAG 0x927c
#define ORIENTATION_TAG 0x112
diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h
index 6ffe82e2e7..97e4e12065 100644
--- a/libavcodec/version_major.h
+++ b/libavcodec/version_major.h
@@ -42,7 +42,6 @@
#define FF_API_V408_CODECID (LIBAVCODEC_VERSION_MAJOR < 63)
#define FF_API_CODEC_PROPS (LIBAVCODEC_VERSION_MAJOR < 63)
#define FF_API_EXR_GAMMA (LIBAVCODEC_VERSION_MAJOR < 63)
-#define FF_API_OLD_EXIF (LIBAVCODEC_VERSION_MAJOR < 63)
#define FF_API_NVDEC_OLD_PIX_FMTS (LIBAVCODEC_VERSION_MAJOR < 63)
-----------------------------------------------------------------------
Summary of changes:
libavcodec/exif.c | 4 ++--
libavcodec/exif_internal.h | 4 ++--
libavcodec/version_major.h | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
