[FFmpeg-cvslog] Merge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Apr 13 11:05:50 2017 +0200| [1849d0caa52f6748f59c75ee0d29adde9cb3451b] | committer: Hendrik Leppkes

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1849d0caa52f6748f59c75ee0d29adde9cb3451b
---

 libavformat/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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


======================================================================

diff --cc libavformat/Makefile
index a1dae894fe,6146cbe12a..6bdfbe6789
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -106,11 -84,9 +106,10 @@@ OBJS-$(CONFIG_AST_MUXER
  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
 +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_AVS_DEMUXER)               += avs.o voc_packet.o voc.o
 +OBJS-$(CONFIG_AVR_DEMUXER)               += avr.o pcm.o
 +OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o voc_packet.o vocdec.o voc.o
  OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
  OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
  OBJS-$(CONFIG_BINK_DEMUXER)              += bink.o
@@@ -534,24 -378,13 +533,25 @@@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER
  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
 +OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o
 +OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o
 +OBJS-$(CONFIG_LIBOPENMPT_DEMUXER)        += libopenmpt.o
  OBJS-$(CONFIG_LIBRTMP)                   += librtmp.o
 +OBJS-$(CONFIG_LIBSSH_PROTOCOL)           += libssh.o
 +OBJS-$(CONFIG_LIBSMBCLIENT_PROTOCOL)     += libsmbclient.o
  
  # protocols I/O
 +OBJS-$(CONFIG_ASYNC_PROTOCOL)            += async.o
  OBJS-$(CONFIG_APPLEHTTP_PROTOCOL)        += hlsproto.o
 +OBJS-$(CONFIG_BLURAY_PROTOCOL)           += bluray.o
 +OBJS-$(CONFIG_CACHE_PROTOCOL)            += cache.o
  OBJS-$(CONFIG_CONCAT_PROTOCOL)           += concat.o
  OBJS-$(CONFIG_CRYPTO_PROTOCOL)           += crypto.o
 +OBJS-$(CONFIG_DATA_PROTOCOL)             += data_uri.o
  OBJS-$(CONFIG_FFRTMPCRYPT_PROTOCOL)      += rtmpcrypt.o rtmpdh.o
  OBJS-$(CONFIG_FFRTMPHTTP_PROTOCOL)       += rtmphttp.o
  OBJS-$(CONFIG_FILE_PROTOCOL)             += file.o