diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 02:38:16 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 02:38:16 +0400 |
commit | 65e63072f81641f50e5775be5c3b2873e8d6f38e (patch) | |
tree | 766617aff5fadbb6bee949ee7669c9431d00a374 /libavfilter/Makefile | |
parent | ba4aa656ce1c4e530bec4ed1b0fcf67eb20283f0 (diff) | |
parent | a4d3f3580bd993f4e8f4abc9c4ad486cb1c51987 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Return a proper error code instead of -1
rtmp: Check malloc calls
rtmp: Check ff_rtmp_packet_create calls
lavfi: add audio mix filter
flvdec: Make sure sample_rate is set to the updated value
tqi: Pass errors from the MB decoder
Conflicts:
Changelog
doc/filters.texi
libavcodec/eatqi.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/Makefile')
-rw-r--r-- | libavfilter/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 1ec6c625f2..29345fc15e 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -47,6 +47,7 @@ OBJS-$(CONFIG_SWSCALE) += lswsutils.o OBJS-$(CONFIG_ACONVERT_FILTER) += af_aconvert.o OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o OBJS-$(CONFIG_AMERGE_FILTER) += af_amerge.o +OBJS-$(CONFIG_AMIX_FILTER) += af_amix.o OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o OBJS-$(CONFIG_ARESAMPLE_FILTER) += af_aresample.o OBJS-$(CONFIG_ASHOWINFO_FILTER) += af_ashowinfo.o |