diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 02:27:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 02:27:31 +0200 |
| commit | 1cbf7fb4345a3e5b7791d483241bf4759bde4ece (patch) | |
| tree | d7acd8317309e051fb240e3505f77aabe2ea0437 /libavfilter/allfilters.c | |
| parent | a48abf5e263ad7f2e68821766e7cf4d29befb58e (diff) | |
| parent | 0ff0af731ce4544f84b2f748dcc699717a2df8d6 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits)
fate: use diff -b in oneline comparison
Add missing version bumps and APIchanges/Changelog entries.
lavfi: move buffer management function to a separate file.
lavfi: move formats-related functions from default.c to formats.c
lavfi: move video-related functions to a separate file.
fate: make smjpeg a demux test
fate: separate sierra-vmd audio and video tests
fate: separate smacker audio and video tests
libmp3lame: set supported channel layouts.
avconv: automatically insert asyncts when -async is used.
avconv: add support for audio filters.
lavfi: add asyncts filter.
lavfi: add aformat filter
lavfi: add an audio buffer sink.
lavfi: add an audio buffer source.
buffersrc: add av_buffersrc_write_frame().
buffersrc: fix invalid read in uninit if the fifo hasn't been allocated
lavfi: rename vsrc_buffer.c to buffersrc.c
avfiltergraph: reindent
lavfi: add channel layout/sample rate negotiation.
...
Conflicts:
Changelog
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffprobe.c
libavcodec/libmp3lame.c
libavfilter/Makefile
libavfilter/af_aformat.c
libavfilter/allfilters.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/defaults.c
libavfilter/formats.c
libavfilter/src_buffer.c
libavfilter/version.h
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c
libavfilter/vsrc_buffer.h
libavutil/avutil.h
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/allfilters.c')
| -rw-r--r-- | libavfilter/allfilters.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 4e4c5d37f4..29cd3e3402 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -42,13 +42,13 @@ void avfilter_register_all(void) REGISTER_FILTER (ASHOWINFO, ashowinfo, af); REGISTER_FILTER (ASPLIT, asplit, af); REGISTER_FILTER (ASTREAMSYNC, astreamsync, af); + REGISTER_FILTER (ASYNCTS, asyncts, af); REGISTER_FILTER (EARWAX, earwax, af); REGISTER_FILTER (PAN, pan, af); REGISTER_FILTER (SILENCEDETECT, silencedetect, af); REGISTER_FILTER (VOLUME, volume, af); REGISTER_FILTER (RESAMPLE, resample, af); - REGISTER_FILTER (ABUFFER, abuffer, asrc); REGISTER_FILTER (AEVALSRC, aevalsrc, asrc); REGISTER_FILTER (AMOVIE, amovie, asrc); REGISTER_FILTER (ANULLSRC, anullsrc, asrc); @@ -130,10 +130,18 @@ void avfilter_register_all(void) avfilter_register(&avfilter_vsrc_buffer); } { + extern AVFilter avfilter_asrc_abuffer; + avfilter_register(&avfilter_asrc_abuffer); + } + { extern AVFilter avfilter_vsink_buffer; avfilter_register(&avfilter_vsink_buffer); } { + extern AVFilter avfilter_asink_abuffer; + avfilter_register(&avfilter_asink_abuffer); + } + { extern AVFilter avfilter_vf_scale; avfilter_register(&avfilter_vf_scale); } |