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/Makefile | |
| parent | 1cba7fa364a9c95773d779ff5d5602be8391310e (diff) | |
| parent | a1e05b0487a1939334c2920fc7f9936bc9efe876 (diff) | |
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/Makefile')
| -rw-r--r-- | libavfilter/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 04edff9d81..947b070e88 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -73,6 +73,7 @@ OBJS-$(CONFIG_ASTATS_FILTER) += af_astats.o OBJS-$(CONFIG_ASTREAMSYNC_FILTER) += af_astreamsync.o OBJS-$(CONFIG_ASYNCTS_FILTER) += af_asyncts.o OBJS-$(CONFIG_ATEMPO_FILTER) += af_atempo.o +OBJS-$(CONFIG_ATRIM_FILTER) += trim.o OBJS-$(CONFIG_BANDPASS_FILTER) += af_biquads.o OBJS-$(CONFIG_BANDREJECT_FILTER) += af_biquads.o OBJS-$(CONFIG_BASS_FILTER) += af_biquads.o @@ -178,6 +179,7 @@ OBJS-$(CONFIG_THUMBNAIL_FILTER) += vf_thumbnail.o OBJS-$(CONFIG_TILE_FILTER) += vf_tile.o OBJS-$(CONFIG_TINTERLACE_FILTER) += vf_tinterlace.o OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o +OBJS-$(CONFIG_TRIM_FILTER) += trim.o OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o OBJS-$(CONFIG_VIDSTABDETECT_FILTER) += vidstabutils.o vf_vidstabdetect.o |