[FFmpeg-cvslog] lavu: add av_scanf_format() and use it on av_sscanf()

[Jacob Lifshay]

ffmpeg | branch: master | Jacob Lifshay <programmerjake at gmail.com> | Sun Jul 20 17:54:25 2025 -0700| [157d3b007e93d39483bdc79278911f84b68b3c56] | committer: Michael Niedermayer

lavu: add av_scanf_format() and use it on av_sscanf()

Signed-off-by: Jacob Lifshay <programmerjake at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=157d3b007e93d39483bdc79278911f84b68b3c56
---

 doc/APIchanges         | 3 +++
 libavutil/attributes.h | 2 ++
 libavutil/avstring.h   | 2 +-
 libavutil/version.h    | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 80eb408788..5c40b7c13d 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2025-03-28
 
 API changes, most recent first:
 
+2025-07-20 - xxxxxxxxxx - lavu 60.6.100 - attributes.h, avstring.h
+  Add av_scanf_format() and use it on av_sscanf().
+
 2025-07-18 - xxxxxxxxxx - lavu 60.5.100 - pixfmt.h
   Add AV_PIX_FMT_OHCODEC.
 
diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index 04c615c952..d15ede1286 100644
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -159,9 +159,11 @@
 #if defined(__GNUC__) || defined(__clang__)
 #    define av_builtin_constant_p __builtin_constant_p
 #    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
+#    define av_scanf_format(fmtpos, attrpos) __attribute__((__format__(__scanf__, fmtpos, attrpos)))
 #else
 #    define av_builtin_constant_p(x) 0
 #    define av_printf_format(fmtpos, attrpos)
+#    define av_scanf_format(fmtpos, attrpos)
 #endif
 
 #if AV_GCC_VERSION_AT_LEAST(2,5) || defined(__clang__)
diff --git a/libavutil/avstring.h b/libavutil/avstring.h
index fc095349d2..17f7b03db5 100644
--- a/libavutil/avstring.h
+++ b/libavutil/avstring.h
@@ -419,7 +419,7 @@ int av_match_list(const char *name, const char *list, char separator);
  * See libc sscanf manual for more information.
  * Locale-independent sscanf implementation.
  */
-int av_sscanf(const char *string, const char *format, ...);
+int av_sscanf(const char *string, const char *format, ...) av_scanf_format(2, 3);
 
 /**
  * @}
diff --git a/libavutil/version.h b/libavutil/version.h
index 29cd31e229..946429b8fc 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  60
-#define LIBAVUTIL_VERSION_MINOR   5
+#define LIBAVUTIL_VERSION_MINOR   6
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \