This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit c32a719cb27a7c9b81501f943a4ed9b64c8fc378 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon Mar 9 06:41:36 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 19:15:57 2026 +0200 avutil: Remove FF_API_OPT_INT_LIST Deprecated on 2024-09-30. Signed-off-by: Andreas Rheinhardt <[email protected]> --- fftools/textformat/avtextformat.c | 6 ++++-- fftools/textformat/tf_compact.c | 4 ++-- fftools/textformat/tf_default.c | 3 ++- fftools/textformat/tf_flat.c | 3 +-- fftools/textformat/tf_ini.c | 4 +--- fftools/textformat/tf_json.c | 3 +-- fftools/textformat/tf_mermaid.c | 3 +-- fftools/textformat/tf_xml.c | 4 ++-- libavcodec/avdct.h | 3 +++ libavcodec/v210enc.h | 5 ++--- libavformat/async.c | 4 +++- libavformat/bluray.c | 1 + libavformat/cache.c | 4 +++- libavformat/crypto.c | 4 ++++ libavformat/file.c | 3 +++ libavformat/ipfsgateway.c | 3 +++ libavformat/libsmbclient.c | 2 ++ libavformat/network.c | 2 ++ libavformat/shared.c | 3 +++ libavformat/subfile.c | 2 ++ libavutil/avutil.h | 24 ------------------------ libavutil/opt.h | 19 ------------------- libavutil/utils.c | 21 --------------------- libavutil/version.h | 1 - 24 files changed, 45 insertions(+), 86 deletions(-) diff --git a/fftools/textformat/avtextformat.c b/fftools/textformat/avtextformat.c index 05459f6e30..104137226b 100644 --- a/fftools/textformat/avtextformat.c +++ b/fftools/textformat/avtextformat.c @@ -18,19 +18,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <limits.h> +#include <math.h> #include <stdarg.h> -#include <stdint.h> #include <stdio.h> #include <string.h> #include "libavutil/mem.h" #include "libavutil/avassert.h" +#include "libavutil/avutil.h" #include "libavutil/base64.h" #include "libavutil/bprint.h" +#include "libavutil/common.h" #include "libavutil/error.h" #include "libavutil/hash.h" -#include "libavutil/intreadwrite.h" #include "libavutil/macros.h" #include "libavutil/opt.h" #include "avtextformat.h" diff --git a/fftools/textformat/tf_compact.c b/fftools/textformat/tf_compact.c index c6311b5dea..fc6bd5250b 100644 --- a/fftools/textformat/tf_compact.c +++ b/fftools/textformat/tf_compact.c @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <limits.h> #include <stdarg.h> -#include <stdint.h> -#include <stdio.h> #include <string.h> #include "avtextformat.h" +#include "libavutil/avutil.h" #include "libavutil/bprint.h" #include "libavutil/error.h" #include "libavutil/opt.h" diff --git a/fftools/textformat/tf_default.c b/fftools/textformat/tf_default.c index 019bda9d44..78a463dd49 100644 --- a/fftools/textformat/tf_default.c +++ b/fftools/textformat/tf_default.c @@ -18,13 +18,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <limits.h> #include <stdarg.h> -#include <stdint.h> #include <stdio.h> #include <string.h> #include "avtextformat.h" +#include "libavutil/avutil.h" #include "libavutil/bprint.h" #include "libavutil/opt.h" #include "tf_internal.h" diff --git a/fftools/textformat/tf_flat.c b/fftools/textformat/tf_flat.c index d5517f109b..8e7e62c48a 100644 --- a/fftools/textformat/tf_flat.c +++ b/fftools/textformat/tf_flat.c @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <limits.h> #include <stdarg.h> -#include <stdint.h> -#include <stdio.h> #include <string.h> #include "avtextformat.h" diff --git a/fftools/textformat/tf_ini.c b/fftools/textformat/tf_ini.c index d3c69483e4..63fccc940f 100644 --- a/fftools/textformat/tf_ini.c +++ b/fftools/textformat/tf_ini.c @@ -18,11 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <limits.h> #include <stdarg.h> -#include <stdint.h> -#include <stdio.h> -#include <string.h> #include "avtextformat.h" diff --git a/fftools/textformat/tf_json.c b/fftools/textformat/tf_json.c index 78ea5dc21f..7980a41fda 100644 --- a/fftools/textformat/tf_json.c +++ b/fftools/textformat/tf_json.c @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <limits.h> #include <stdarg.h> -#include <stdint.h> -#include <stdio.h> #include <string.h> #include "avtextformat.h" diff --git a/fftools/textformat/tf_mermaid.c b/fftools/textformat/tf_mermaid.c index fae53d9c40..0eea73bd79 100644 --- a/fftools/textformat/tf_mermaid.c +++ b/fftools/textformat/tf_mermaid.c @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <limits.h> #include <stdarg.h> -#include <stdint.h> -#include <stdio.h> #include <string.h> #include "avtextformat.h" diff --git a/fftools/textformat/tf_xml.c b/fftools/textformat/tf_xml.c index d4329110f9..bad2a86bce 100644 --- a/fftools/textformat/tf_xml.c +++ b/fftools/textformat/tf_xml.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdint.h> -#include <string.h> +#include <inttypes.h> +#include <stddef.h> #include "avtextformat.h" #include "libavutil/bprint.h" diff --git a/libavcodec/avdct.h b/libavcodec/avdct.h index 6411fab6f6..f110ba7249 100644 --- a/libavcodec/avdct.h +++ b/libavcodec/avdct.h @@ -19,6 +19,9 @@ #ifndef AVCODEC_AVDCT_H #define AVCODEC_AVDCT_H +#include <stddef.h> +#include <stdint.h> + #include "libavutil/opt.h" /** diff --git a/libavcodec/v210enc.h b/libavcodec/v210enc.h index b74fd33db5..61b0f89bd7 100644 --- a/libavcodec/v210enc.h +++ b/libavcodec/v210enc.h @@ -19,9 +19,8 @@ #ifndef AVCODEC_V210ENC_H #define AVCODEC_V210ENC_H -#include "libavutil/log.h" -#include "libavutil/opt.h" -#include "libavutil/pixfmt.h" +#include <stddef.h> +#include <stdint.h> typedef struct V210EncContext { void (*pack_line_8)(const uint8_t *y, const uint8_t *u, diff --git a/libavformat/async.c b/libavformat/async.c index e0329e23ec..5831b12bd5 100644 --- a/libavformat/async.c +++ b/libavformat/async.c @@ -27,6 +27,9 @@ * support work with concatdec, hls */ +#include <inttypes.h> +#include <string.h> + #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/error.h" @@ -35,7 +38,6 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "url.h" -#include <stdint.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/libavformat/bluray.c b/libavformat/bluray.c index 1845551c34..ade5ae9479 100644 --- a/libavformat/bluray.c +++ b/libavformat/bluray.c @@ -23,6 +23,7 @@ #include <libbluray/bluray.h> #include "libavutil/avstring.h" +#include "libavutil/error.h" #include "libavformat/url.h" #include "libavutil/opt.h" diff --git a/libavformat/cache.c b/libavformat/cache.c index 0d682213d5..9574f85c39 100644 --- a/libavformat/cache.c +++ b/libavformat/cache.c @@ -27,8 +27,11 @@ * support filling with a background thread */ +#include <inttypes.h> + #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/error.h" #include "libavutil/file_open.h" #include "libavutil/mem.h" #include "libavutil/opt.h" @@ -42,7 +45,6 @@ #include <unistd.h> #endif #include <sys/stat.h> -#include <stdlib.h> #include "os_support.h" #include "url.h" diff --git a/libavformat/crypto.c b/libavformat/crypto.c index bcfee6a3ee..4bc47f0128 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -19,8 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> +#include <string.h> + #include "libavutil/aes.h" #include "libavutil/avstring.h" +#include "libavutil/error.h" #include "libavutil/mem.h" #include "libavutil/opt.h" #include "url.h" diff --git a/libavformat/file.c b/libavformat/file.c index 1bac50ac7f..71d30a25c4 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -19,9 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "config_components.h" #include "libavutil/avstring.h" +#include "libavutil/error.h" #include "libavutil/file_open.h" #include "libavutil/internal.h" #include "libavutil/mem.h" diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c index 4699b8c3d7..1ea1742801 100644 --- a/libavformat/ipfsgateway.c +++ b/libavformat/ipfsgateway.c @@ -19,7 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "libavutil/avstring.h" +#include "libavutil/error.h" #include "libavutil/file_open.h" #include "libavutil/getenv_utf8.h" #include "libavutil/mem.h" diff --git a/libavformat/libsmbclient.c b/libavformat/libsmbclient.c index 28de2daa9b..e35708db30 100644 --- a/libavformat/libsmbclient.c +++ b/libavformat/libsmbclient.c @@ -19,7 +19,9 @@ */ #include <libsmbclient.h> +#include <string.h> #include "libavutil/avstring.h" +#include "libavutil/error.h" #include "libavutil/mem.h" #include "libavutil/opt.h" #include "url.h" diff --git a/libavformat/network.c b/libavformat/network.c index 5bfc28d80d..2b7e665bc4 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "config.h" #include "config_components.h" #include "libavutil/attributes.h" diff --git a/libavformat/shared.c b/libavformat/shared.c index a7dccb33df..7c8b17350c 100644 --- a/libavformat/shared.c +++ b/libavformat/shared.c @@ -25,6 +25,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/crc.h" +#include "libavutil/error.h" #include "libavutil/hash.h" #include "libavutil/file_open.h" #include "libavutil/mem.h" @@ -35,7 +36,9 @@ #include <errno.h> #include <fcntl.h> +#include <inttypes.h> #include <stdatomic.h> +#include <string.h> #include <sys/file.h> #include <sys/mman.h> #include <sys/stat.h> diff --git a/libavformat/subfile.c b/libavformat/subfile.c index 89799feaec..a77e477db2 100644 --- a/libavformat/subfile.c +++ b/libavformat/subfile.c @@ -20,6 +20,8 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/common.h" +#include "libavutil/error.h" #include "libavutil/opt.h" #include "url.h" diff --git a/libavutil/avutil.h b/libavutil/avutil.h index c8ae114ab6..003a63b7b1 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -313,30 +313,6 @@ static inline void *av_x_if_null(const void *p, const void *x) return (void *)(intptr_t)(p ? p : x); } -#if FF_API_OPT_INT_LIST -/** - * Compute the length of an integer list. - * - * @param elsize size in bytes of each list element (only 1, 2, 4 or 8) - * @param term list terminator (usually 0 or -1) - * @param list pointer to the list - * @return length of the list, in elements, not counting the terminator - */ -attribute_deprecated -unsigned av_int_list_length_for_size(unsigned elsize, - const void *list, uint64_t term) av_pure; - -/** - * Compute the length of an integer list. - * - * @param term list terminator (usually 0 or -1) - * @param list pointer to the list - * @return length of the list, in elements, not counting the terminator - */ -#define av_int_list_length(list, term) \ - av_int_list_length_for_size(sizeof(*(list)), list, term) -#endif - /** * Return the fractional representation of the internal time base. */ diff --git a/libavutil/opt.h b/libavutil/opt.h index ab24fae777..82420bba47 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -28,7 +28,6 @@ */ #include "rational.h" -#include "avutil.h" #include "channel_layout.h" #include "dict.h" #include "log.h" @@ -886,24 +885,6 @@ int av_opt_set_chlayout(void *obj, const char *name, const AVChannelLayout *layo */ int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags); -#if FF_API_OPT_INT_LIST -/** - * Set a binary option to an integer list. - * - * @param obj AVClass object to set options on - * @param name name of the binary option - * @param val pointer to an integer list (must have the correct type with - * regard to the contents of the list) - * @param term list terminator (usually 0 or -1) - * @param flags search flags - */ -#define av_opt_set_int_list(obj, name, val, term, flags) \ - (av_int_list_length(val, term) > INT_MAX / sizeof(*(val)) ? \ - AVERROR(EINVAL) : \ - av_opt_set_bin(obj, name, (const uint8_t *)(val), \ - av_int_list_length(val, term) * sizeof(*(val)), flags)) -#endif - /** * Add, replace, or remove elements for an array option. Which of these * operations is performed depends on the values of val and search_flags. diff --git a/libavutil/utils.c b/libavutil/utils.c index fc431fdd60..d77388752b 100644 --- a/libavutil/utils.c +++ b/libavutil/utils.c @@ -51,27 +51,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type) } } -#if FF_API_OPT_INT_LIST -unsigned av_int_list_length_for_size(unsigned elsize, - const void *list, uint64_t term) -{ - unsigned i; - - if (!list) - return 0; -#define LIST_LENGTH(type) \ - { type t = term, *l = (type *)list; for (i = 0; l[i] != t; i++); } - switch (elsize) { - case 1: LIST_LENGTH(uint8_t); break; - case 2: LIST_LENGTH(uint16_t); break; - case 4: LIST_LENGTH(uint32_t); break; - case 8: LIST_LENGTH(uint64_t); break; - default: av_assert0(!"valid element size"); - } - return i; -} -#endif - char *av_fourcc_make_string(char *buf, uint32_t fourcc) { int i; diff --git a/libavutil/version.h b/libavutil/version.h index 331fbc32b3..becca0e0f1 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_OPT_INT_LIST (LIBAVUTIL_VERSION_MAJOR < 61) #define FF_API_OPT_PTR (LIBAVUTIL_VERSION_MAJOR < 61) #define FF_API_CPU_FLAG_FORCE (LIBAVUTIL_VERSION_MAJOR < 61) #define FF_API_DOVI_L11_INVALID_PROPS (LIBAVUTIL_VERSION_MAJOR < 61) _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
