ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Sep 2 16:50:45 2018 -0300| [41cd5af3250ef976f0a48adeb6dbccc9b2683e58] | committer: James Almer
Merge commit '23be4eebf8aaa7519b12b2a49e5c5c6c4d076e6a' * commit '23be4eebf8aaa7519b12b2a49e5c5c6c4d076e6a': build: Group external library protocols separately Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41cd5af3250ef976f0a48adeb6dbccc9b2683e58 --- configure | 22 ++++++++++++---------- libavformat/Makefile | 20 +++++++++++--------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/configure b/configure index d2df05fa55..9d10912120 100755 --- a/configure +++ b/configure @@ -3288,18 +3288,8 @@ httpproxy_protocol_suggest="zlib" https_protocol_select="tls_protocol" https_protocol_suggest="zlib" icecast_protocol_select="http_protocol" -librtmp_protocol_deps="librtmp" -librtmpe_protocol_deps="librtmp" -librtmps_protocol_deps="librtmp" -librtmpt_protocol_deps="librtmp" -librtmpte_protocol_deps="librtmp" -libsmbclient_protocol_deps="libsmbclient gplv3" -libssh_protocol_deps="libssh" -libtls_conflict="openssl gnutls mbedtls" mmsh_protocol_select="http_protocol" mmst_protocol_select="network" -libsrt_protocol_deps="libsrt" -libsrt_protocol_select="network" rtmp_protocol_conflict="librtmp_protocol" rtmp_protocol_select="tcp_protocol" rtmp_protocol_suggest="zlib" @@ -3328,6 +3318,18 @@ udplite_protocol_select="network" unix_protocol_deps="sys_un_h" unix_protocol_select="network" +# external library protocols +librtmp_protocol_deps="librtmp" +librtmpe_protocol_deps="librtmp" +librtmps_protocol_deps="librtmp" +librtmpt_protocol_deps="librtmp" +librtmpte_protocol_deps="librtmp" +libsmbclient_protocol_deps="libsmbclient gplv3" +libsrt_protocol_deps="libsrt" +libsrt_protocol_select="network" +libssh_protocol_deps="libssh" +libtls_conflict="openssl gnutls mbedtls" + # filters afftfilt_filter_deps="avcodec" afftfilt_filter_select="fft" diff --git a/libavformat/Makefile b/libavformat/Makefile index 2f08457eec..608f7f1f85 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -557,20 +557,12 @@ OBJS-$(CONFIG_YOP_DEMUXER) += yop.o OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpegdec.o OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpegenc.o -# external libraries +# external library muxers/demuxers 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_LIBOPENMPT_DEMUXER) += libopenmpt.o -OBJS-$(CONFIG_LIBRTMP_PROTOCOL) += librtmp.o -OBJS-$(CONFIG_LIBRTMPE_PROTOCOL) += librtmp.o -OBJS-$(CONFIG_LIBRTMPS_PROTOCOL) += librtmp.o -OBJS-$(CONFIG_LIBRTMPT_PROTOCOL) += librtmp.o -OBJS-$(CONFIG_LIBRTMPTE_PROTOCOL) += librtmp.o -OBJS-$(CONFIG_LIBSRT_PROTOCOL) += libsrt.o -OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o -OBJS-$(CONFIG_LIBSMBCLIENT_PROTOCOL) += libsmbclient.o OBJS-$(CONFIG_VAPOURSYNTH_DEMUXER) += vapoursynth.o # protocols I/O @@ -619,6 +611,16 @@ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o OBJS-$(CONFIG_UDPLITE_PROTOCOL) += udp.o OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o +# external library protocols +OBJS-$(CONFIG_LIBRTMP_PROTOCOL) += librtmp.o +OBJS-$(CONFIG_LIBRTMPE_PROTOCOL) += librtmp.o +OBJS-$(CONFIG_LIBRTMPS_PROTOCOL) += librtmp.o +OBJS-$(CONFIG_LIBRTMPT_PROTOCOL) += librtmp.o +OBJS-$(CONFIG_LIBRTMPTE_PROTOCOL) += librtmp.o +OBJS-$(CONFIG_LIBSMBCLIENT_PROTOCOL) += libsmbclient.o +OBJS-$(CONFIG_LIBSRT_PROTOCOL) += libsrt.o +OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o + # libavdevice dependencies OBJS-$(CONFIG_IEC61883_INDEV) += dv.o ====================================================================== diff --cc configure index d2df05fa55,1be3dfc9f1..9d10912120 --- a/configure +++ b/configure @@@ -3328,34 -2546,21 +3318,46 @@@ udplite_protocol_select="network unix_protocol_deps="sys_un_h" unix_protocol_select="network" + # external library protocols + librtmp_protocol_deps="librtmp" + librtmpe_protocol_deps="librtmp" + librtmps_protocol_deps="librtmp" + librtmpt_protocol_deps="librtmp" + librtmpte_protocol_deps="librtmp" ++libsmbclient_protocol_deps="libsmbclient gplv3" + libsrt_protocol_deps="libsrt" + libsrt_protocol_select="network" ++libssh_protocol_deps="libssh" ++libtls_conflict="openssl gnutls mbedtls" + # filters -asyncts_filter_deps="avresample" +afftfilt_filter_deps="avcodec" +afftfilt_filter_select="fft" +afir_filter_deps="avcodec" +afir_filter_select="fft" +amovie_filter_deps="avcodec avformat" +aresample_filter_deps="swresample" +ass_filter_deps="libass" +atempo_filter_deps="avcodec" +atempo_filter_select="rdft" +avgblur_opencl_filter_deps="opencl" +azmq_filter_deps="libzmq" blackframe_filter_deps="gpl" boxblur_filter_deps="gpl" +boxblur_opencl_filter_deps="opencl gpl" bs2b_filter_deps="libbs2b" +colormatrix_filter_deps="gpl" +convolution_opencl_filter_deps="opencl" +convolve_filter_deps="avcodec" +convolve_filter_select="fft" +coreimage_filter_deps="coreimage appkit" +coreimage_filter_extralibs="-framework OpenGL" +coreimagesrc_filter_deps="coreimage appkit" +coreimagesrc_filter_extralibs="-framework OpenGL" +cover_rect_filter_deps="avcodec avformat gpl" cropdetect_filter_deps="gpl" +deconvolve_filter_deps="avcodec" +deconvolve_filter_select="fft" deinterlace_qsv_filter_deps="libmfx" deinterlace_vaapi_filter_deps="vaapi" delogo_filter_deps="gpl" diff --cc libavformat/Makefile index 2f08457eec,4f1e9bae85..608f7f1f85 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@@ -557,30 -377,13 +557,22 @@@ OBJS-$(CONFIG_YOP_DEMUXER OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpegdec.o OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpegenc.o - # external libraries + # external library muxers/demuxers 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_LIBOPENMPT_DEMUXER) += libopenmpt.o - OBJS-$(CONFIG_LIBRTMP_PROTOCOL) += librtmp.o - OBJS-$(CONFIG_LIBRTMPE_PROTOCOL) += librtmp.o - OBJS-$(CONFIG_LIBRTMPS_PROTOCOL) += librtmp.o - OBJS-$(CONFIG_LIBRTMPT_PROTOCOL) += librtmp.o - OBJS-$(CONFIG_LIBRTMPTE_PROTOCOL) += librtmp.o - OBJS-$(CONFIG_LIBSRT_PROTOCOL) += libsrt.o - OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o - OBJS-$(CONFIG_LIBSMBCLIENT_PROTOCOL) += libsmbclient.o +OBJS-$(CONFIG_VAPOURSYNTH_DEMUXER) += vapoursynth.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 rtmpdigest.o rtmpdh.o OBJS-$(CONFIG_FFRTMPHTTP_PROTOCOL) += rtmphttp.o OBJS-$(CONFIG_FILE_PROTOCOL) += file.o @@@ -605,25 -406,16 +597,35 @@@ OBJS-$(CONFIG_RTMPTS_PROTOCOL OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_SCTP_PROTOCOL) += sctp.o OBJS-$(CONFIG_SRTP_PROTOCOL) += srtpproto.o srtp.o +OBJS-$(CONFIG_SUBFILE_PROTOCOL) += subfile.o +OBJS-$(CONFIG_TEE_PROTOCOL) += teeproto.o tee_common.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o TLS-OBJS-$(CONFIG_GNUTLS) += tls_gnutls.o +TLS-OBJS-$(CONFIG_LIBTLS) += tls_libtls.o +TLS-OBJS-$(CONFIG_MBEDTLS) += tls_mbedtls.o TLS-OBJS-$(CONFIG_OPENSSL) += tls_openssl.o +TLS-OBJS-$(CONFIG_SECURETRANSPORT) += tls_securetransport.o +TLS-OBJS-$(CONFIG_SCHANNEL) += tls_schannel.o OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o $(TLS-OBJS-yes) OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o +OBJS-$(CONFIG_UDPLITE_PROTOCOL) += udp.o OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o + # external library protocols -OBJS-$(CONFIG_LIBRTMP) += librtmp.o ++OBJS-$(CONFIG_LIBRTMP_PROTOCOL) += librtmp.o ++OBJS-$(CONFIG_LIBRTMPE_PROTOCOL) += librtmp.o ++OBJS-$(CONFIG_LIBRTMPS_PROTOCOL) += librtmp.o ++OBJS-$(CONFIG_LIBRTMPT_PROTOCOL) += librtmp.o ++OBJS-$(CONFIG_LIBRTMPTE_PROTOCOL) += librtmp.o ++OBJS-$(CONFIG_LIBSMBCLIENT_PROTOCOL) += libsmbclient.o + OBJS-$(CONFIG_LIBSRT_PROTOCOL) += libsrt.o ++OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o ++ +# libavdevice dependencies +OBJS-$(CONFIG_IEC61883_INDEV) += dv.o + +# Windows resource file +SLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
