virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

avutil: remove FF_API_D2STR

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-01-11 10:37:58 -03:00 committed by Anton Khirnov
parent 4fcd6c82cf
commit 30e1e7e0f3
4 changed files with 0 additions and 36 deletions

10
libavutil/avstring.c

@ -139,16 +139,6 @@ end:
return p; 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" #define WHITESPACES " \n\t\r"
char *av_get_token(const char **buf, const char *term) char *av_get_token(const char **buf, const char *term)

9
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); 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, * Unescape the given string until a non escaped terminating char,
* and return the token corresponding to the unescaped string. * and return the token corresponding to the unescaped string.

16
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 [2], "Education consists mainly in what we have instead.");
TEST_STRIREPLACE(haystack, needle [1], "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; return 0;
} }

1
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_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58)
#define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58)
#define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58)