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/avf_concat.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/avf_concat.c')
| -rw-r--r-- | libavfilter/avf_concat.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 2b3640b1b0..8312efa514 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -409,8 +409,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_free(cat->in); } -static const char *const shorthand[] = { NULL }; - AVFilter avfilter_avf_concat = { .name = "concat", .description = NULL_IF_CONFIG_SMALL("Concatenate audio and video streams."), @@ -421,5 +419,4 @@ AVFilter avfilter_avf_concat = { .inputs = NULL, .outputs = NULL, .priv_class = &concat_class, - .shorthand = shorthand, }; |