diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 11:26:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 11:34:34 +0200 |
| commit | 3319679d0a36bec3e78f639d6f9fbbe596f6eec3 (patch) | |
| tree | 77d6f0a7a0280252793d2462ff5be86dcf4a9cd4 /libavfilter/allfilters.c | |
| parent | 1cba7fa364a9c95773d779ff5d5602be8391310e (diff) | |
| parent | a1e05b0487a1939334c2920fc7f9936bc9efe876 (diff) | |
| download | ffmpeg-3319679d0a36bec3e78f639d6f9fbbe596f6eec3.tar.gz | |
Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
lavfi: add trim and atrim filters.
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/allfilters.c')
| -rw-r--r-- | libavfilter/allfilters.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 97e558beed..228a22d896 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -71,6 +71,7 @@ void avfilter_register_all(void) REGISTER_FILTER(ASTREAMSYNC, astreamsync, af); REGISTER_FILTER(ASYNCTS, asyncts, af); REGISTER_FILTER(ATEMPO, atempo, af); + REGISTER_FILTER(ATRIM, atrim, af); REGISTER_FILTER(BANDPASS, bandpass, af); REGISTER_FILTER(BANDREJECT, bandreject, af); REGISTER_FILTER(BASS, bass, af); @@ -175,6 +176,7 @@ void avfilter_register_all(void) REGISTER_FILTER(TILE, tile, vf); REGISTER_FILTER(TINTERLACE, tinterlace, vf); REGISTER_FILTER(TRANSPOSE, transpose, vf); + REGISTER_FILTER(TRIM, trim, vf); REGISTER_FILTER(UNSHARP, unsharp, vf); REGISTER_FILTER(VFLIP, vflip, vf); REGISTER_FILTER(VIDSTABDETECT, vidstabdetect, vf); |