[FFmpeg-cvslog] build: Set correct dependencies for rtmp* protocols implemented by librtmp.

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Feb 10 20:29:29 2012 +0100| [d1c4ec7f5e9af61067bc1a604e29e465038be63a] | committer: Diego Biurrun

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

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

 configure                |    4 ++++
 libavformat/allformats.c |   10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index a1cbd69..d816389 100755
--- a/configure
+++ b/configure
@@ -1504,6 +1504,10 @@ https_protocol_select="tls_protocol"
 mmsh_protocol_select="http_protocol"
 mmst_protocol_deps="network"
 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"
 tcp_protocol_deps="network"
 tls_protocol_deps_any="openssl gnutls"
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 66a8cfe..9a1f94d 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -254,12 +254,10 @@ void av_register_all(void)
     REGISTER_PROTOCOL (MD5,  md5);
     REGISTER_PROTOCOL (PIPE, pipe);
     REGISTER_PROTOCOL (RTMP, rtmp);
-#if CONFIG_LIBRTMP
-    REGISTER_PROTOCOL (RTMP, rtmpt);
-    REGISTER_PROTOCOL (RTMP, rtmpe);
-    REGISTER_PROTOCOL (RTMP, rtmpte);
-    REGISTER_PROTOCOL (RTMP, rtmps);
-#endif
+    REGISTER_PROTOCOL (RTMPE, rtmpe);
+    REGISTER_PROTOCOL (RTMPS, rtmps);
+    REGISTER_PROTOCOL (RTMPT, rtmpt);
+    REGISTER_PROTOCOL (RTMPTE, rtmpte);
     REGISTER_PROTOCOL (RTP, rtp);
     REGISTER_PROTOCOL (TCP, tcp);
     REGISTER_PROTOCOL (TLS, tls);