提交 6a9a40b6 编写于 作者: M Matt Oliver

project: Update for recent upstream merge.

上级 715f453d
......@@ -2054,6 +2054,7 @@
%define CONFIG_NUT_MUXER 1
%define CONFIG_OGA_MUXER 1
%define CONFIG_OGG_MUXER 1
%define CONFIG_OGV_MUXER 1
%define CONFIG_OMA_MUXER 1
%define CONFIG_OPUS_MUXER 1
%define CONFIG_PCM_ALAW_MUXER 1
......@@ -2194,6 +2195,7 @@
%define CONFIG_SCTP_PROTOCOL 0
%define CONFIG_SRTP_PROTOCOL 1
%define CONFIG_SUBFILE_PROTOCOL 1
%define CONFIG_TEE_PROTOCOL 1
%define CONFIG_TCP_PROTOCOL 1
%define CONFIG_TLS_GNUTLS_PROTOCOL 1
%define CONFIG_TLS_SCHANNEL_PROTOCOL 0
......
......@@ -2114,6 +2114,7 @@
#define CONFIG_NUT_MUXER 1
#define CONFIG_OGA_MUXER 1
#define CONFIG_OGG_MUXER 1
#define CONFIG_OGV_MUXER 1
#define CONFIG_OMA_MUXER 1
#define CONFIG_OPUS_MUXER 1
#define CONFIG_PCM_ALAW_MUXER 1
......@@ -2254,6 +2255,7 @@
#define CONFIG_SCTP_PROTOCOL 0
#define CONFIG_SRTP_PROTOCOL 1
#define CONFIG_SUBFILE_PROTOCOL 1
#define CONFIG_TEE_PROTOCOL 1
#define CONFIG_TCP_PROTOCOL 1
#define CONFIG_TLS_GNUTLS_PROTOCOL 1
#define CONFIG_TLS_SCHANNEL_PROTOCOL 0
......
......@@ -498,6 +498,7 @@
<ClCompile Include="..\libavformat\rtpproto.c" />
<ClCompile Include="..\libavformat\srtpproto.c" />
<ClCompile Include="..\libavformat\subfile.c" />
<ClCompile Include="..\libavformat\teeproto.c" />
<ClCompile Include="..\libavformat\tcp.c" />
<ClCompile Include="..\libavformat\tls_gnutls.c" />
<ClCompile Include="..\libavformat\tls.c" />
......
......@@ -1315,6 +1315,9 @@
<ClCompile Include="..\libavformat\subfile.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\teeproto.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\tcp.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
......
......@@ -28,6 +28,7 @@ static const URLProtocol *url_protocols[] = {
&ff_rtp_protocol,
&ff_srtp_protocol,
&ff_subfile_protocol,
&ff_tee_protocol,
&ff_tcp_protocol,
&ff_tls_gnutls_protocol,
&ff_udp_protocol,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册