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/Makefile | |
| parent | a48abf5e263ad7f2e68821766e7cf4d29befb58e (diff) | |
| parent | 0ff0af731ce4544f84b2f748dcc699717a2df8d6 (diff) | |
| download | ffmpeg-1cbf7fb4345a3e5b7791d483241bf4759bde4ece.tar.gz | |
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/Makefile')
| -rw-r--r-- | libavfilter/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 70f2c9e5ca..1f9d4117d1 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -2,6 +2,7 @@ include $(SUBDIR)../config.mak NAME = avfilter FFLIBS = avutil swscale +FFLIBS-$(CONFIG_ASYNCTS_FILTER) += avresample FFLIBS-$(CONFIG_RESAMPLE_FILTER) += avresample FFLIBS-$(CONFIG_ACONVERT_FILTER) += swresample @@ -25,6 +26,7 @@ OBJS = allfilters.o \ audio.o \ avfilter.o \ avfiltergraph.o \ + buffer.o \ buffersink.o \ defaults.o \ drawutils.o \ @@ -34,6 +36,8 @@ OBJS = allfilters.o \ src_buffer.o \ transform.o \ vf_scale.o \ + video.o \ + OBJS-$(CONFIG_AVCODEC) += avcodec.o OBJS-$(CONFIG_AVFORMAT) += lavfutils.o @@ -47,6 +51,7 @@ OBJS-$(CONFIG_ARESAMPLE_FILTER) += af_aresample.o OBJS-$(CONFIG_ASHOWINFO_FILTER) += af_ashowinfo.o OBJS-$(CONFIG_ASPLIT_FILTER) += af_asplit.o OBJS-$(CONFIG_ASTREAMSYNC_FILTER) += af_astreamsync.o +OBJS-$(CONFIG_ASYNCTS_FILTER) += af_asyncts.o OBJS-$(CONFIG_EARWAX_FILTER) += af_earwax.o OBJS-$(CONFIG_PAN_FILTER) += af_pan.o OBJS-$(CONFIG_RESAMPLE_FILTER) += af_resample.o |