aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-22 23:40:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-22 23:42:17 +0200
commitea5dab58e074a91330e1f076a4cbe8fece889afe (patch)
treea94e47797fdd3adf9ac8b995cd562c2acf2fd2d3 /libavfilter/Makefile
parent841c1be57e59bc133cb615b48b0888ad9833156b (diff)
parentc89e428ed8c2c31396af2d18cab4342b7d82958f (diff)
downloadffmpeg-ea5dab58e074a91330e1f076a4cbe8fece889afe.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: dwt: check malloc calls ppc: Drop unused header regs.h af_resample: remove an extra space in the log output Convert vector_fmul range of functions to YASM and add AVX versions lavfi: add an audio split filter lavfi: rename vf_split.c to split.c Conflicts: doc/filters.texi libavcodec/ppc/regs.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/f_split.c libavfilter/split.c libavfilter/version.h libavfilter/vf_split.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/Makefile')
-rw-r--r--libavfilter/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 70a4f60991..1ec6c625f2 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -50,7 +50,7 @@ OBJS-$(CONFIG_AMERGE_FILTER) += af_amerge.o
OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o
OBJS-$(CONFIG_ARESAMPLE_FILTER) += af_aresample.o
OBJS-$(CONFIG_ASHOWINFO_FILTER) += af_ashowinfo.o
-OBJS-$(CONFIG_ASPLIT_FILTER) += f_split.o
+OBJS-$(CONFIG_ASPLIT_FILTER) += split.o
OBJS-$(CONFIG_ASTREAMSYNC_FILTER) += af_astreamsync.o
OBJS-$(CONFIG_ASYNCTS_FILTER) += af_asyncts.o
OBJS-$(CONFIG_EARWAX_FILTER) += af_earwax.o
@@ -109,7 +109,7 @@ OBJS-$(CONFIG_SETSAR_FILTER) += vf_aspect.o
OBJS-$(CONFIG_SETTB_FILTER) += vf_settb.o
OBJS-$(CONFIG_SHOWINFO_FILTER) += vf_showinfo.o
OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o
-OBJS-$(CONFIG_SPLIT_FILTER) += f_split.o
+OBJS-$(CONFIG_SPLIT_FILTER) += split.o
OBJS-$(CONFIG_SUPER2XSAI_FILTER) += vf_super2xsai.o
OBJS-$(CONFIG_SWAPUV_FILTER) += vf_swapuv.o
OBJS-$(CONFIG_THUMBNAIL_FILTER) += vf_thumbnail.o