diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:10:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:10:59 +0200 |
| commit | 6a2fb5b90cb77bbcd33102b6cfa76a786152c1c3 (patch) | |
| tree | 01b5badc0c32d180a63b8b81553cef40407f6884 /libavfilter | |
| parent | 8695d9de4704aa328b6dd0e9826c04da44d04046 (diff) | |
| parent | ffea3b00c39caa8ad78456ae08c8353929974dfd (diff) | |
Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'
* commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd':
vf_settb: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_settb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.c | 1 | ||||
| -rw-r--r-- | libavfilter/f_settb.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 904164fb1c..71d5e9cc4e 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -691,6 +691,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "aperms") || !strcmp(filter->filter->name, "resample") || !strcmp(filter->filter->name, "setpts" ) || + !strcmp(filter->filter->name, "settb" ) || !strcmp(filter->filter->name, "showspectrum") || !strcmp(filter->filter->name, "silencedetect") || !strcmp(filter->filter->name, "smartblur") || diff --git a/libavfilter/f_settb.c b/libavfilter/f_settb.c index b8bfbb3f0d..df03274dcb 100644 --- a/libavfilter/f_settb.c +++ b/libavfilter/f_settb.c @@ -60,7 +60,7 @@ typedef struct { #define OFFSET(x) offsetof(SetTBContext, x) #define DEFINE_OPTIONS(filt_name, filt_type) \ static const AVOption filt_name##_options[] = { \ - { "tb", "set timebase expression", OFFSET(tb_expr), AV_OPT_TYPE_STRING, {.str="intb"}, \ + { "tb", "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 } \ } @@ -149,11 +149,10 @@ AVFilter avfilter_vf_settb = { .description = NULL_IF_CONFIG_SMALL("Set timebase for the video output link."), .priv_size = sizeof(SetTBContext), + .priv_class = &settb_class, .inputs = avfilter_vf_settb_inputs, .outputs = avfilter_vf_settb_outputs, - .priv_class = &settb_class, - .shorthand = shorthand, }; #endif |