aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-02-13 19:37:25 +0100
committerDiego Biurrun <diego@biurrun.de>2012-02-14 11:37:01 +0100
commitc3b57d6e76cd3df87652639405505b7de5746ca8 (patch)
treef96961335199f7f2e6d5ed9d9f158ad3c13386b2 /configure
parentdf6050188c5bfa4dd7eed62a662506187810249b (diff)
downloadandroid_external_ffmpeg-c3b57d6e76cd3df87652639405505b7de5746ca8.tar.gz
android_external_ffmpeg-c3b57d6e76cd3df87652639405505b7de5746ca8.tar.bz2
android_external_ffmpeg-c3b57d6e76cd3df87652639405505b7de5746ca8.zip
librtmp: Add "lib" prefix to librtmp URLProtocol declarations.
This allows easily differentiating between both implementations within the build system and combining the native implementation for plain RTMP with librtmp for the RTMPE, RTMPS, RTMPT, RTMPTE protocol variants.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 6 insertions, 4 deletions
diff --git a/configure b/configure
index d816389fe0..5c0e56c4c0 100755
--- a/configure
+++ b/configure
@@ -1501,13 +1501,15 @@ httpproxy_protocol_select="tcp_protocol"
http_protocol_deps="network"
http_protocol_select="tcp_protocol"
https_protocol_select="tls_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_deps="network"
+rtmp_protocol_deps="!librtmp_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"
tcp_protocol_deps="network"
tls_protocol_deps_any="openssl gnutls"