diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:54:05 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:54:10 +0200 |
commit | a87e85fa722e34639fe53d64586faa309f51afcc (patch) | |
tree | 27aebfe1bf7ea3f888b904508ccc38f57fa09464 /libavfilter/f_select.c | |
parent | 0724b4a16d6b88b311610e96c7ba341a4b33965d (diff) | |
parent | 77add967a5e5dae8f322578580c440cb990624ab (diff) | |
download | ffmpeg-a87e85fa722e34639fe53d64586faa309f51afcc.tar.gz |
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
* ubitux/shorthand-cleanup:
lavfi/setfield: switch to an AVOptions-based system.
lavfi/asettb: switch to an AVOptions-based system.
lavfi/aselect: switch to an AVOptions-based system.
lavfi/sine: switch to an AVOptions-based system.
lavfi/deshake: switch to an AVOptions-based system.
lavfi/tinterlace: switch to an AVOptions-based system.
lavfi/tile: switch to an AVOptions-based system.
lavfi/concat: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/f_select.c')
-rw-r--r-- | libavfilter/f_select.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index e2c4ef719a..b34196dee3 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -388,8 +388,6 @@ static int query_formats(AVFilterContext *ctx) return 0; } -static const char *const shorthand[] = { "expr", NULL }; - #if CONFIG_ASELECT_FILTER #define OFFSET(x) offsetof(SelectContext, x) @@ -445,7 +443,6 @@ AVFilter avfilter_af_aselect = { .inputs = avfilter_af_aselect_inputs, .outputs = avfilter_af_aselect_outputs, .priv_class = &aselect_class, - .shorthand = shorthand, }; #endif /* CONFIG_ASELECT_FILTER */ |