virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

build: Set correct dependencies for rtmp* protocols implemented by librtmp.

Browse Source
This commit is contained in:
Diego Biurrun
2012-02-10 20:29:29 +01:00
parent 3e23badd83
commit d1c4ec7f5e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -1504,6 +1504,10 @@ https_protocol_select="tls_protocol"
mmsh_protocol_select="http_protocol" mmsh_protocol_select="http_protocol"
mmst_protocol_deps="network" mmst_protocol_deps="network"
rtmp_protocol_select="tcp_protocol" rtmp_protocol_select="tcp_protocol"
rtmpe_protocol_deps="librtmp"
rtmps_protocol_deps="librtmp"
rtmpt_protocol_deps="librtmp"
rtmpte_protocol_deps="librtmp"
rtp_protocol_select="udp_protocol" rtp_protocol_select="udp_protocol"
tcp_protocol_deps="network" tcp_protocol_deps="network"
tls_protocol_deps_any="openssl gnutls" tls_protocol_deps_any="openssl gnutls"

10
libavformat/allformats.c
View File

@@ -254,12 +254,10 @@ void av_register_all(void)
REGISTER_PROTOCOL (MD5, md5); REGISTER_PROTOCOL (MD5, md5);
REGISTER_PROTOCOL (PIPE, pipe); REGISTER_PROTOCOL (PIPE, pipe);
REGISTER_PROTOCOL (RTMP, rtmp); REGISTER_PROTOCOL (RTMP, rtmp);
#if CONFIG_LIBRTMP REGISTER_PROTOCOL (RTMPE, rtmpe);
REGISTER_PROTOCOL (RTMP, rtmpt); REGISTER_PROTOCOL (RTMPS, rtmps);
REGISTER_PROTOCOL (RTMP, rtmpe); REGISTER_PROTOCOL (RTMPT, rtmpt);
REGISTER_PROTOCOL (RTMP, rtmpte); REGISTER_PROTOCOL (RTMPTE, rtmpte);
REGISTER_PROTOCOL (RTMP, rtmps);
#endif
REGISTER_PROTOCOL (RTP, rtp); REGISTER_PROTOCOL (RTP, rtp);
REGISTER_PROTOCOL (TCP, tcp); REGISTER_PROTOCOL (TCP, tcp);
REGISTER_PROTOCOL (TLS, tls); REGISTER_PROTOCOL (TLS, tls);