diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 14:30:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 14:30:34 +0200 |
| commit | 16fc24b240cafc37cd1ea402e9ab2b4cd5ba6269 (patch) | |
| tree | 52a05d82a06726683e0c993f78d9774ec1d3a83a /libavfilter/af_join.c | |
| parent | 46de9ba5981531dcbfe05943448bebc5569fb3df (diff) | |
| parent | 7cdd737ba81b5c2c9521c4509edf0ac315fabc65 (diff) | |
| download | ffmpeg-16fc24b240cafc37cd1ea402e9ab2b4cd5ba6269.tar.gz | |
Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65'
* commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65':
lavfi: mark filters with dynamic number of inputs or outputs with special flags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_join.c')
| -rw-r--r-- | libavfilter/af_join.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index f3fdccafc1..88aef10b5b 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -525,4 +525,6 @@ AVFilter avfilter_af_join = { .inputs = NULL, .outputs = avfilter_af_join_outputs, + + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; |