diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-04-13 11:05:50 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-04-13 11:06:27 +0200 |
| commit | 1849d0caa52f6748f59c75ee0d29adde9cb3451b (patch) | |
| tree | 877005df2ae80fdcd436de1ef54ff3f460a12b70 /libavformat/Makefile | |
| parent | a45951c0a4917d3a1e3857a02689770654adcdeb (diff) | |
| parent | 9265364bec0af2e8b7c3a6de7bfc8291a0b70bca (diff) | |
| download | ffmpeg-1849d0caa52f6748f59c75ee0d29adde9cb3451b.tar.gz | |
Merge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'
* commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca':
build: Separate avisynth and avxsynth support
Mostly noop, since it could break linux configure with --enable-avisynth,
and the configure code which was simplified isn't even present in
ffmpeg.
Only merged the cosmetic re-ordering in the Makefile.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index a1dae894fe..6bdfbe6789 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -107,7 +107,6 @@ OBJS-$(CONFIG_AU_DEMUXER) += au.o pcm.o OBJS-$(CONFIG_AU_MUXER) += au.o rawenc.o OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o OBJS-$(CONFIG_AVI_MUXER) += avienc.o mpegtsenc.o avlanguage.o rawutils.o -OBJS-$(CONFIG_AVISYNTH_DEMUXER) += avisynth.o OBJS-$(CONFIG_AVM2_MUXER) += swfenc.o swf.o OBJS-$(CONFIG_AVR_DEMUXER) += avr.o pcm.o OBJS-$(CONFIG_AVS_DEMUXER) += avs.o voc_packet.o vocdec.o voc.o @@ -534,6 +533,7 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpegdec.o OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpegenc.o # external libraries +OBJS-$(CONFIG_AVISYNTH_DEMUXER) += avisynth.o OBJS-$(CONFIG_CHROMAPRINT_MUXER) += chromaprint.o OBJS-$(CONFIG_LIBGME_DEMUXER) += libgme.o OBJS-$(CONFIG_LIBMODPLUG_DEMUXER) += libmodplug.o |