highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/asettb: switch to an AVOptions-based system.

Browse Source
This commit is contained in:
Clément Bœsch 2013-04-11 11:48:42 +02:00
parent cb2327e88d
commit 73c1a00e73
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/filters.texi
View File

@ -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

1
libavfilter/avfilter.c
View File

@ -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" ) ||

7
libavfilter/f_settb.c
View File

@ -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)
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 = {
.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