diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 00:38:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 00:38:16 +0200 |
| commit | 65e63072f81641f50e5775be5c3b2873e8d6f38e (patch) | |
| tree | 766617aff5fadbb6bee949ee7669c9431d00a374 /libavfilter/allfilters.c | |
| parent | ba4aa656ce1c4e530bec4ed1b0fcf67eb20283f0 (diff) | |
| parent | a4d3f3580bd993f4e8f4abc9c4ad486cb1c51987 (diff) | |
| download | ffmpeg-65e63072f81641f50e5775be5c3b2873e8d6f38e.tar.gz | |
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/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 aaaef1900c..b9d44f2fdf 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -37,6 +37,7 @@ void avfilter_register_all(void) REGISTER_FILTER (ACONVERT, aconvert, af); REGISTER_FILTER (AFORMAT, aformat, af); REGISTER_FILTER (AMERGE, amerge, af); + REGISTER_FILTER (AMIX, amix, af); REGISTER_FILTER (ANULL, anull, af); REGISTER_FILTER (ARESAMPLE, aresample, af); REGISTER_FILTER (ASHOWINFO, ashowinfo, af); |