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
71718de8
Commit
71718de8
authored
Sep 15, 2014
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avutil: remove obsolete FF_API_FIND_OPT cruft
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
1abb7728
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
36 deletions
+0
-36
opt.c
libavutil/opt.c
+0
-14
opt.h
libavutil/opt.h
+0
-19
version.h
libavutil/version.h
+0
-3
No files found.
libavutil/opt.c
View file @
71718de8
...
...
@@ -40,20 +40,6 @@
#include <float.h>
#if FF_API_FIND_OPT
//FIXME order them and do a bin search
const
AVOption
*
av_find_opt
(
void
*
v
,
const
char
*
name
,
const
char
*
unit
,
int
mask
,
int
flags
)
{
const
AVOption
*
o
=
NULL
;
while
((
o
=
av_next_option
(
v
,
o
)))
{
if
(
!
strcmp
(
o
->
name
,
name
)
&&
(
!
unit
||
(
o
->
unit
&&
!
strcmp
(
o
->
unit
,
unit
)))
&&
(
o
->
flags
&
mask
)
==
flags
)
return
o
;
}
return
NULL
;
}
#endif
#if FF_API_OLD_AVOPTIONS
const
AVOption
*
av_next_option
(
void
*
obj
,
const
AVOption
*
last
)
{
...
...
libavutil/opt.h
View file @
71718de8
...
...
@@ -378,25 +378,6 @@ typedef struct AVOptionRanges {
}
AVOptionRanges
;
#if FF_API_FIND_OPT
/**
* Look for an option in obj. Look only for the options which
* have the flags set as specified in mask and flags (that is,
* for which it is the case that (opt->flags & mask) == flags).
*
* @param[in] obj a pointer to a struct whose first element is a
* pointer to an AVClass
* @param[in] name the name of the option to look for
* @param[in] unit the unit of the option to look for, or any if NULL
* @return a pointer to the option found, or NULL if no option
* has been found
*
* @deprecated use av_opt_find.
*/
attribute_deprecated
const
AVOption
*
av_find_opt
(
void
*
obj
,
const
char
*
name
,
const
char
*
unit
,
int
mask
,
int
flags
);
#endif
#if FF_API_OLD_AVOPTIONS
/**
* Set the field of obj with the given name to value.
...
...
libavutil/version.h
View file @
71718de8
...
...
@@ -80,9 +80,6 @@
* @{
*/
#ifndef FF_API_FIND_OPT
#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_OLD_AVOPTIONS
#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
...
...
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