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
ad7d972e
Commit
ad7d972e
authored
Aug 18, 2015
by
Ronald S. Bultje
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi: add error message to help users convert to new lavfi syntax.
parent
22f85543
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
avfilter.c
libavfilter/avfilter.c
+12
-1
version.h
libavfilter/version.h
+3
-0
No files found.
libavfilter/avfilter.c
View file @
ad7d972e
...
...
@@ -895,7 +895,7 @@ int avfilter_init_str(AVFilterContext *filter, const char *args)
return
AVERROR
(
EINVAL
);
}
#if FF_API_OLD_FILTER_OPTS
#if FF_API_OLD_FILTER_OPTS
|| FF_API_OLD_FILTER_OPTS_ERROR
if
(
!
strcmp
(
filter
->
filter
->
name
,
"format"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"noformat"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"frei0r"
)
||
...
...
@@ -955,12 +955,23 @@ int avfilter_init_str(AVFilterContext *filter, const char *args)
while
((
p
=
strchr
(
p
,
':'
)))
*
p
++
=
'|'
;
#if FF_API_OLD_FILTER_OPTS
if
(
deprecated
)
av_log
(
filter
,
AV_LOG_WARNING
,
"This syntax is deprecated. Use "
"'|' to separate the list items.
\n
"
);
av_log
(
filter
,
AV_LOG_DEBUG
,
"compat: called with args=[%s]
\n
"
,
copy
);
ret
=
process_options
(
filter
,
&
options
,
copy
);
#else
if
(
deprecated
)
{
av_log
(
filter
,
AV_LOG_ERROR
,
"This syntax is deprecated. Use "
"'|' to separate the list items ('%s' instead of '%s')
\n
"
,
copy
,
args
);
ret
=
AVERROR
(
EINVAL
);
}
else
{
ret
=
process_options
(
filter
,
&
options
,
copy
);
}
#endif
av_freep
(
&
copy
);
if
(
ret
<
0
)
...
...
libavfilter/version.h
View file @
ad7d972e
...
...
@@ -61,6 +61,9 @@
#ifndef FF_API_OLD_FILTER_OPTS
#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 6)
#endif
#ifndef FF_API_OLD_FILTER_OPTS_ERROR
#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
#ifndef FF_API_AVFILTER_OPEN
#define FF_API_AVFILTER_OPEN (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