From 23be4eebf8aaa7519b12b2a49e5c5c6c4d076e6a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 22 Mar 2018 14:57:53 +0100 Subject: [PATCH] build: Group external library protocols separately --- configure | 16 +++++++++------- libavformat/Makefile | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 465fdcfb6d..1be3dfc9f1 100755 --- a/configure +++ b/configure @@ -2519,15 +2519,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" 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" @@ -2553,6 +2546,15 @@ udp_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" +libsrt_protocol_deps="libsrt" +libsrt_protocol_select="network" + # filters asyncts_filter_deps="avresample" blackframe_filter_deps="gpl" diff --git a/libavformat/Makefile b/libavformat/Makefile index 96085d20c6..4f1e9bae85 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -377,9 +377,8 @@ 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_LIBRTMP) += librtmp.o # protocols I/O OBJS-$(CONFIG_APPLEHTTP_PROTOCOL) += hlsproto.o @@ -414,7 +413,8 @@ OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o $(TLS-OBJS-yes) OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o -# external libraries +# external library protocols +OBJS-$(CONFIG_LIBRTMP) += librtmp.o OBJS-$(CONFIG_LIBSRT_PROTOCOL) += libsrt.o SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h