diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 11:48:42 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 11:53:53 +0200 |
| commit | 73c1a00e73fbfcf27ce6fb474e3080ac0b1b445b (patch) | |
| tree | 479b0b438925e681bb3351566ee3b00762a86017 | |
| parent | cb2327e88d662e3c1da812bc18e9c504d068dd74 (diff) | |
| download | ffmpeg-73c1a00e73fbfcf27ce6fb474e3080ac0b1b445b.tar.gz | |
lavfi/asettb: switch to an AVOptions-based system.
| -rw-r--r-- | doc/filters.texi | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 | ||||
| -rw-r--r-- | libavfilter/f_settb.c | 7 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 2a5b9af4a2..94518d1514 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6873,7 +6873,7 @@ This filter accepts the following options: @table @option -@item expr +@item expr, tb The expression which is evaluated into the output timebase. @end table diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c59d155565..a6a426c7e8 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -750,6 +750,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "rgbtestsrc") || !strcmp(filter->filter->name, "setpts" ) || !strcmp(filter->filter->name, "settb" ) || + !strcmp(filter->filter->name, "asettb" ) || !strcmp(filter->filter->name, "showspectrum") || !strcmp(filter->filter->name, "silencedetect") || !strcmp(filter->filter->name, "sine" ) || diff --git a/libavfilter/f_settb.c b/libavfilter/f_settb.c index df03274dcb..b1eac716e3 100644 --- a/libavfilter/f_settb.c +++ b/libavfilter/f_settb.c @@ -60,7 +60,9 @@ typedef struct { #define OFFSET(x) offsetof(SetTBContext, x) #define DEFINE_OPTIONS(filt_name, filt_type) \ 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 }, \ { NULL } \ } @@ -118,8 +120,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return ff_filter_frame(outlink, frame); } -static const char *const shorthand[] = { "tb", NULL }; - #if CONFIG_SETTB_FILTER DEFINE_OPTIONS(settb, VIDEO); @@ -188,6 +188,5 @@ AVFilter avfilter_af_asettb = { .inputs = avfilter_af_asettb_inputs, .outputs = avfilter_af_asettb_outputs, .priv_class = &asettb_class, - .shorthand = shorthand, }; #endif |