Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
8d900aa4
Commit
8d900aa4
authored
Jun 17, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft
parent
a5e8c41c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
20 deletions
+6
-20
avfiltergraph.c
libavfilter/avfiltergraph.c
+0
-2
avfiltergraph.h
libavfilter/avfiltergraph.h
+0
-2
graphparser.c
libavfilter/graphparser.c
+6
-13
version.h
libavfilter/version.h
+0
-3
No files found.
libavfilter/avfiltergraph.c
View file @
8d900aa4
...
...
@@ -42,9 +42,7 @@ AVFilterGraph *avfilter_graph_alloc(void)
AVFilterGraph
*
ret
=
av_mallocz
(
sizeof
(
AVFilterGraph
));
if
(
!
ret
)
return
NULL
;
#if FF_API_GRAPH_AVCLASS
ret
->
av_class
=
&
filtergraph_class
;
#endif
return
ret
;
}
...
...
libavfilter/avfiltergraph.h
View file @
8d900aa4
...
...
@@ -26,9 +26,7 @@
#include "libavutil/log.h"
typedef
struct
AVFilterGraph
{
#if FF_API_GRAPH_AVCLASS
const
AVClass
*
av_class
;
#endif
unsigned
filter_count
;
AVFilterContext
**
filters
;
...
...
libavfilter/graphparser.c
View file @
8d900aa4
...
...
@@ -350,12 +350,6 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
return
pad
;
}
#if FF_API_GRAPH_AVCLASS
#define log_ctx graph
#else
#define log_ctx NULL
#endif
static
int
parse_sws_flags
(
const
char
**
buf
,
AVFilterGraph
*
graph
)
{
char
*
p
=
strchr
(
*
buf
,
';'
);
...
...
@@ -364,7 +358,7 @@ static int parse_sws_flags(const char **buf, AVFilterGraph *graph)
return
0
;
if
(
!
p
)
{
av_log
(
log_ctx
,
AV_LOG_ERROR
,
"sws_flags not terminated with ';'.
\n
"
);
av_log
(
graph
,
AV_LOG_ERROR
,
"sws_flags not terminated with ';'.
\n
"
);
return
AVERROR
(
EINVAL
);
}
...
...
@@ -397,18 +391,18 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
AVFilterContext
*
filter
;
filters
+=
strspn
(
filters
,
WHITESPACES
);
if
((
ret
=
parse_inputs
(
&
filters
,
&
curr_inputs
,
&
open_outputs
,
log_ctx
))
<
0
)
if
((
ret
=
parse_inputs
(
&
filters
,
&
curr_inputs
,
&
open_outputs
,
graph
))
<
0
)
goto
fail
;
if
((
ret
=
parse_filter
(
&
filter
,
&
filters
,
graph
,
index
,
log_ctx
))
<
0
)
if
((
ret
=
parse_filter
(
&
filter
,
&
filters
,
graph
,
index
,
graph
))
<
0
)
goto
fail
;
if
((
ret
=
link_filter_inouts
(
filter
,
&
curr_inputs
,
&
open_inputs
,
log_ctx
))
<
0
)
if
((
ret
=
link_filter_inouts
(
filter
,
&
curr_inputs
,
&
open_inputs
,
graph
))
<
0
)
goto
fail
;
if
((
ret
=
parse_outputs
(
&
filters
,
&
curr_inputs
,
&
open_inputs
,
&
open_outputs
,
log_ctx
))
<
0
)
graph
))
<
0
)
goto
fail
;
filters
+=
strspn
(
filters
,
WHITESPACES
);
...
...
@@ -420,7 +414,7 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
}
while
(
chr
==
','
||
chr
==
';'
);
if
(
chr
)
{
av_log
(
log_ctx
,
AV_LOG_ERROR
,
av_log
(
graph
,
AV_LOG_ERROR
,
"Unable to parse graph description substring:
\"
%s
\"\n
"
,
filters
-
1
);
ret
=
AVERROR
(
EINVAL
);
...
...
@@ -446,7 +440,6 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
return
ret
;
}
#undef log_ctx
int
avfilter_graph_parse
(
AVFilterGraph
*
graph
,
const
char
*
filters
,
AVFilterInOut
*
open_inputs
,
...
...
libavfilter/version.h
View file @
8d900aa4
...
...
@@ -44,9 +44,6 @@
* Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time.
*/
#ifndef FF_API_GRAPH_AVCLASS
#define FF_API_GRAPH_AVCLASS (LIBAVFILTER_VERSION_MAJOR > 2)
#endif
#ifndef FF_API_SAMPLERATE64
#define FF_API_SAMPLERATE64 (LIBAVFILTER_VERSION_MAJOR < 3)
#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