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
73c1a00e
Commit
73c1a00e
authored
Apr 11, 2013
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/asettb: switch to an AVOptions-based system.
parent
cb2327e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
filters.texi
doc/filters.texi
+1
-1
avfilter.c
libavfilter/avfilter.c
+1
-0
f_settb.c
libavfilter/f_settb.c
+3
-4
No files found.
doc/filters.texi
View file @
73c1a00e
...
@@ -6873,7 +6873,7 @@ This filter accepts the following options:
...
@@ -6873,7 +6873,7 @@ This filter accepts the following options:
@table @option
@table @option
@item expr
@item expr
, tb
The expression which is evaluated into the output timebase.
The expression which is evaluated into the output timebase.
@end table
@end table
...
...
libavfilter/avfilter.c
View file @
73c1a00e
...
@@ -750,6 +750,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
...
@@ -750,6 +750,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!
strcmp
(
filter
->
filter
->
name
,
"rgbtestsrc"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"rgbtestsrc"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"setpts"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"setpts"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"settb"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"settb"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"asettb"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"showspectrum"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"showspectrum"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"silencedetect"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"silencedetect"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"sine"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"sine"
)
||
...
...
libavfilter/f_settb.c
View file @
73c1a00e
...
@@ -60,7 +60,9 @@ typedef struct {
...
@@ -60,7 +60,9 @@ typedef struct {
#define OFFSET(x) offsetof(SetTBContext, x)
#define OFFSET(x) offsetof(SetTBContext, x)
#define DEFINE_OPTIONS(filt_name, filt_type) \
#define DEFINE_OPTIONS(filt_name, filt_type) \
static const AVOption filt_name##_options[] = { \
static const AVOption filt_name##_options[] = { \
{ "tb", "Expression determining the output timebase", OFFSET(tb_expr), AV_OPT_TYPE_STRING, {.str="intb"}, \
{ "expr", "set expression determining the output timebase", OFFSET(tb_expr), AV_OPT_TYPE_STRING, {.str="intb"}, \
.flags=AV_OPT_FLAG_##filt_type##_PARAM|AV_OPT_FLAG_FILTERING_PARAM }, \
{ "tb", "set expression determining the output timebase", OFFSET(tb_expr), AV_OPT_TYPE_STRING, {.str="intb"}, \
.flags=AV_OPT_FLAG_##filt_type##_PARAM|AV_OPT_FLAG_FILTERING_PARAM }, \
.flags=AV_OPT_FLAG_##filt_type##_PARAM|AV_OPT_FLAG_FILTERING_PARAM }, \
{ NULL } \
{ NULL } \
}
}
...
@@ -118,8 +120,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
...
@@ -118,8 +120,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
return
ff_filter_frame
(
outlink
,
frame
);
return
ff_filter_frame
(
outlink
,
frame
);
}
}
static
const
char
*
const
shorthand
[]
=
{
"tb"
,
NULL
};
#if CONFIG_SETTB_FILTER
#if CONFIG_SETTB_FILTER
DEFINE_OPTIONS
(
settb
,
VIDEO
);
DEFINE_OPTIONS
(
settb
,
VIDEO
);
...
@@ -188,6 +188,5 @@ AVFilter avfilter_af_asettb = {
...
@@ -188,6 +188,5 @@ AVFilter avfilter_af_asettb = {
.
inputs
=
avfilter_af_asettb_inputs
,
.
inputs
=
avfilter_af_asettb_inputs
,
.
outputs
=
avfilter_af_asettb_outputs
,
.
outputs
=
avfilter_af_asettb_outputs
,
.
priv_class
=
&
asettb_class
,
.
priv_class
=
&
asettb_class
,
.
shorthand
=
shorthand
,
};
};
#endif
#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