Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
30e1e7e0
Commit
30e1e7e0
authored
Jan 11, 2023
by
James Almer
Committed by
Anton Khirnov
Feb 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avutil: remove FF_API_D2STR
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
4fcd6c82
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
36 deletions
+0
-36
avstring.c
libavutil/avstring.c
+0
-10
avstring.h
libavutil/avstring.h
+0
-9
avstring.c
libavutil/tests/avstring.c
+0
-16
version.h
libavutil/version.h
+0
-1
No files found.
libavutil/avstring.c
View file @
30e1e7e0
...
...
@@ -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
)
...
...
libavutil/avstring.h
View file @
30e1e7e0
...
...
@@ -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.
...
...
libavutil/tests/avstring.c
View file @
30e1e7e0
...
...
@@ -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
;
}
libavutil/version.h
View file @
30e1e7e0
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment