diff options
author | James Almer <jamrial@gmail.com> | 2025-08-20 10:44:12 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2025-08-20 10:44:12 -0300 |
commit | d151d3aecbe2a478c44be7faca56caae1848ca87 (patch) | |
tree | 15d11d2196e813e6fc8dbe90dba2f5b89c78e4d8 | |
parent | 451e6bed436ada70a761a90f1d08f1fa505020fd (diff) | |
download | ffmpeg-d151d3aecbe2a478c44be7faca56caae1848ca87.tar.gz |
avcodec/exif: don't expose a private function in an installed header
And it doesn't need an entry in APIChanges, given it's not public API.
Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r-- | doc/APIchanges | 2 | ||||
-rw-r--r-- | libavcodec/exif.h | 6 | ||||
-rw-r--r-- | libavcodec/exif_internal.h | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 4b32279e35..81970f17f4 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,8 +13,6 @@ API changes, most recent first: av_exif_ifd_to_dict, av_exif_clone_ifd, av_exif_matrix_to_orientation, av_exif_orientation_to_matrix, - Deprecate: - - avpriv_exif_decode_ifd (deprecated behind FF_API_OLD_EXIF) 2025-08-19 - bb90b262d6d - lavu 60.10.100 - frame.h Add AV_FRAME_DATA_EXIF. diff --git a/libavcodec/exif.h b/libavcodec/exif.h index b6d1ffd91d..944d7ee666 100644 --- a/libavcodec/exif.h +++ b/libavcodec/exif.h @@ -223,10 +223,4 @@ int av_exif_matrix_to_orientation(const int32_t *matrix); */ int av_exif_orientation_to_matrix(int32_t *matrix, int orientation); -#if FF_API_OLD_EXIF -/* 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 /* AVCODEC_EXIF_H */ diff --git a/libavcodec/exif_internal.h b/libavcodec/exif_internal.h index 7d8e225250..de1a26e3f9 100644 --- a/libavcodec/exif_internal.h +++ b/libavcodec/exif_internal.h @@ -34,6 +34,13 @@ #include "libavutil/frame.h" #include "exif.h" +#include "version_major.h" + +#if FF_API_OLD_EXIF +/* 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 */ /** * Attach the data buffer to the frame. This is mostly a wrapper for |