Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
e65e4cbb
Commit
e65e4cbb
authored
Jul 28, 2015
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi: Drop deprecated *_count suffixed variables
Deprecated in 06/2012.
parent
86e50565
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
46 deletions
+0
-46
avfilter.c
libavfilter/avfilter.c
+0
-6
avfilter.h
libavfilter/avfilter.h
+0
-15
avfiltergraph.c
libavfilter/avfiltergraph.c
+0
-12
internal.h
libavfilter/internal.h
+0
-10
version.h
libavfilter/version.h
+0
-3
No files found.
libavfilter/avfilter.c
View file @
e65e4cbb
...
...
@@ -445,12 +445,6 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name)
if
(
!
ret
->
outputs
)
goto
err
;
}
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
ret
->
output_count
=
ret
->
nb_outputs
;
ret
->
input_count
=
ret
->
nb_inputs
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
return
ret
;
...
...
libavfilter/avfilter.h
View file @
e65e4cbb
...
...
@@ -429,16 +429,10 @@ struct AVFilterContext {
AVFilterPad
*
input_pads
;
///< array of input pads
AVFilterLink
**
inputs
;
///< array of pointers to input links
#if FF_API_FOO_COUNT
attribute_deprecated
unsigned
input_count
;
///< @deprecated use nb_inputs
#endif
unsigned
nb_inputs
;
///< number of input pads
AVFilterPad
*
output_pads
;
///< array of output pads
AVFilterLink
**
outputs
;
///< array of pointers to output links
#if FF_API_FOO_COUNT
attribute_deprecated
unsigned
output_count
;
///< @deprecated use nb_outputs
#endif
unsigned
nb_outputs
;
///< number of output pads
void
*
priv
;
///< private data for use by the filter
...
...
@@ -799,20 +793,11 @@ typedef int (avfilter_execute_func)(AVFilterContext *ctx, avfilter_action_func *
typedef
struct
AVFilterGraph
{
const
AVClass
*
av_class
;
#if FF_API_FOO_COUNT
attribute_deprecated
unsigned
filter_count
;
#endif
AVFilterContext
**
filters
;
#if !FF_API_FOO_COUNT
unsigned
nb_filters
;
#endif
char
*
scale_sws_opts
;
///< sws options to use for the auto-inserted scale filters
char
*
resample_lavr_opts
;
///< libavresample options to use for the auto-inserted resample filters
#if FF_API_FOO_COUNT
unsigned
nb_filters
;
#endif
/**
* Type of multithreading allowed for filters in this graph. A combination
...
...
libavfilter/avfiltergraph.c
View file @
e65e4cbb
...
...
@@ -127,12 +127,6 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
graph
->
filters
=
filters
;
graph
->
filters
[
graph
->
nb_filters
++
]
=
filter
;
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
graph
->
filter_count
=
graph
->
nb_filters
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
filter
->
graph
=
graph
;
return
0
;
...
...
@@ -193,12 +187,6 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
graph
->
filters
=
filters
;
graph
->
filters
[
graph
->
nb_filters
++
]
=
s
;
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
graph
->
filter_count
=
graph
->
nb_filters
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
s
->
graph
=
graph
;
return
s
;
...
...
libavfilter/internal.h
View file @
e65e4cbb
...
...
@@ -170,11 +170,6 @@ static inline void ff_insert_inpad(AVFilterContext *f, unsigned index,
{
ff_insert_pad
(
index
,
&
f
->
nb_inputs
,
offsetof
(
AVFilterLink
,
dstpad
),
&
f
->
input_pads
,
&
f
->
inputs
,
p
);
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
f
->
input_count
=
f
->
nb_inputs
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
}
/** Insert a new output pad for the filter. */
...
...
@@ -183,11 +178,6 @@ static inline void ff_insert_outpad(AVFilterContext *f, unsigned index,
{
ff_insert_pad
(
index
,
&
f
->
nb_outputs
,
offsetof
(
AVFilterLink
,
srcpad
),
&
f
->
output_pads
,
&
f
->
outputs
,
p
);
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
f
->
output_count
=
f
->
nb_outputs
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
}
/**
...
...
libavfilter/version.h
View file @
e65e4cbb
...
...
@@ -49,9 +49,6 @@
* the public API and may change, break or disappear at any time.
*/
#ifndef FF_API_FOO_COUNT
#define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 6)
#endif
#ifndef FF_API_AVFILTERBUFFER
#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 6)
#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