diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 12:51:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 13:07:20 +0100 |
| commit | 2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a (patch) | |
| tree | 675b3b2b0a1fe5cc983c1d0042ccd55edf5aedc4 /libavfilter/allfilters.c | |
| parent | b76059058aa6ca89836d450b7b07797ebc2d69ec (diff) | |
| parent | 599b81ca9a8e04a27ddad94af462171d16063167 (diff) | |
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'
* commit '599b81ca9a8e04a27ddad94af462171d16063167':
lavfi: add shuffleplanes filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/allfilters.c')
| -rw-r--r-- | libavfilter/allfilters.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index d042b64ce3..e351eac5ff 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -189,6 +189,7 @@ void avfilter_register_all(void) REGISTER_FILTER(SETSAR, setsar, vf); REGISTER_FILTER(SETTB, settb, vf); REGISTER_FILTER(SHOWINFO, showinfo, vf); + REGISTER_FILTER(SHUFFLEPLANES, shuffleplanes, vf); REGISTER_FILTER(SMARTBLUR, smartblur, vf); REGISTER_FILTER(SPLIT, split, vf); REGISTER_FILTER(SPP, spp, vf); |