diff options
| author | James Almer <jamrial@gmail.com> | 2023-01-11 10:37:58 -0300 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-02-09 15:35:14 +0100 |
| commit | 30e1e7e0f324d7bf66b3b8583a3e49fd3cd101b2 (patch) | |
| tree | fab03699d47933580b75b39bf9f1c99a2af1a9c2 | |
| parent | 4fcd6c82cf45160880be35e6c097708323d9d93f (diff) | |
| download | ffmpeg-30e1e7e0f324d7bf66b3b8583a3e49fd3cd101b2.tar.gz | |
avutil: remove FF_API_D2STR
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/avstring.c | 10 | ||||
| -rw-r--r-- | libavutil/avstring.h | 9 | ||||
| -rw-r--r-- | libavutil/tests/avstring.c | 16 | ||||
| -rw-r--r-- | libavutil/version.h | 1 |
4 files changed, 0 insertions, 36 deletions
diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 5ddbe9219e..e460b5be7f 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -139,16 +139,6 @@ end: return p; } -#if FF_API_D2STR -char *av_d2str(double d) -{ - char *str = av_malloc(16); - if (str) - snprintf(str, 16, "%f", d); - return str; -} -#endif - #define WHITESPACES " \n\t\r" char *av_get_token(const char **buf, const char *term) diff --git a/libavutil/avstring.h b/libavutil/avstring.h index 74aa4cd0e4..e260263763 100644 --- a/libavutil/avstring.h +++ b/libavutil/avstring.h @@ -157,15 +157,6 @@ static inline size_t av_strnlen(const char *s, size_t len) */ char *av_asprintf(const char *fmt, ...) av_printf_format(1, 2); -#if FF_API_D2STR -/** - * Convert a number to an av_malloced string. - * @deprecated use av_asprintf() with "%f" or a more specific format - */ -attribute_deprecated -char *av_d2str(double d); -#endif - /** * Unescape the given string until a non escaped terminating char, * and return the token corresponding to the unescaped string. diff --git a/libavutil/tests/avstring.c b/libavutil/tests/avstring.c index 37a2cf1833..bc0bde358d 100644 --- a/libavutil/tests/avstring.c +++ b/libavutil/tests/avstring.c @@ -109,21 +109,5 @@ int main(void) TEST_STRIREPLACE(haystack, needle [2], "Education consists mainly in what we have instead."); TEST_STRIREPLACE(haystack, needle [1], "Education consists mainly in what we have instead"); -#if FF_API_D2STR -FF_DISABLE_DEPRECATION_WARNINGS - /*Testing av_d2str()*/ - #define TEST_D2STR(value, expected) \ - if((ptr = av_d2str(value)) == NULL){ \ - printf("error, received null pointer!\n"); \ - } else { \ - if(strcmp(ptr, expected) != 0) \ - printf( "expected: %s, received: %s\n", expected, ptr); \ - av_free(ptr); \ - } - TEST_D2STR(0 , "0.000000"); - TEST_D2STR(-1.2333234, "-1.233323"); - TEST_D2STR(-1.2333237, "-1.233324"); -FF_ENABLE_DEPRECATION_WARNINGS -#endif return 0; } diff --git a/libavutil/version.h b/libavutil/version.h index 43daf8cd5a..bd5d7afe9d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) |