[FFmpeg-cvslog] Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 17 19:39:57 2016 +0100| [8f540b86125a25ee48ea6da69139356063726b8e] | committer: Derek Buitenhuis

Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'

* commit '65a802401c6cc136576bb2e613c0577cbf622aa8':
  build: Add component for the SRTP common code

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

 configure            |    5 +++--
 libavformat/Makefile |    6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index f167e3b..84a68ef 100755
--- a/configure
+++ b/configure
@@ -2066,6 +2066,7 @@ CONFIG_EXTRA="
     rv34dsp
     sinewin
     snappy
+    srtp
     startcode
     texturedsp
     texturedspenc
@@ -2789,7 +2790,7 @@ ogg_demuxer_select="dirac_parse"
 opus_muxer_select="ogg_muxer"
 psp_muxer_select="mov_muxer"
 rtp_demuxer_select="sdp_demuxer"
-rtpdec_select="asf_demuxer jpegtables mov_demuxer mpegts_demuxer rm_demuxer rtp_protocol"
+rtpdec_select="asf_demuxer jpegtables mov_demuxer mpegts_demuxer rm_demuxer rtp_protocol srtp"
 rtsp_demuxer_select="http_protocol rtpdec"
 rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain"
 sap_demuxer_select="sdp_demuxer"
@@ -2896,7 +2897,7 @@ rtmpts_protocol_select="ffrtmphttp_protocol https_protocol"
 rtp_protocol_select="udp_protocol"
 sctp_protocol_deps="struct_sctp_event_subscribe struct_msghdr_msg_flags"
 sctp_protocol_select="network"
-srtp_protocol_select="rtp_protocol"
+srtp_protocol_select="rtp_protocol srtp"
 tcp_protocol_select="network"
 tls_gnutls_protocol_deps="gnutls !tls_schannel_protocol !tls_securetransport_protocol"
 tls_gnutls_protocol_select="tcp_protocol"
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 4bae3b7..51260f4 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -57,10 +57,10 @@ OBJS-$(CONFIG_RTPDEC)                    += rdt.o                       \
                                             rtpdec_vc2hq.o              \
                                             rtpdec_vp8.o                \
                                             rtpdec_vp9.o                \
-                                            rtpdec_xiph.o               \
-                                            srtp.o
+                                            rtpdec_xiph.o
 OBJS-$(CONFIG_RTPENC_CHAIN)              += rtpenc_chain.o rtp.o
 OBJS-$(CONFIG_SHARED)                    += log2_tab.o golomb_tab.o
+OBJS-$(CONFIG_SRTP)                      += srtp.o
 
 # muxers/demuxers
 OBJS-$(CONFIG_A64_MUXER)                 += a64.o rawenc.o
@@ -573,13 +573,13 @@ SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
 SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
 
 TESTPROGS = seek                                                        \
-            srtp                                                        \
             url                                                         \
 #           async                                                       \
 
 TESTPROGS-$(CONFIG_MOV_MUXER)            += movenc
 TESTPROGS-$(CONFIG_NETWORK)              += noproxy
 TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh
+TESTPROGS-$(CONFIG_SRTP)                 += srtp
 
 TOOLS     = aviocat                                                     \
             ismindex                                                    \


======================================================================

diff --cc configure
index f167e3b,f22ea88..84a68ef
--- a/configure
+++ b/configure
@@@ -2894,21 -2329,16 +2895,21 @@@ rtmpt_protocol_select="ffrtmphttp_proto
  rtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol"
  rtmpts_protocol_select="ffrtmphttp_protocol https_protocol"
  rtp_protocol_select="udp_protocol"
 -sctp_protocol_deps="struct_sctp_event_subscribe"
 +sctp_protocol_deps="struct_sctp_event_subscribe struct_msghdr_msg_flags"
  sctp_protocol_select="network"
- srtp_protocol_select="rtp_protocol"
+ srtp_protocol_select="rtp_protocol srtp"
  tcp_protocol_select="network"
 -tls_gnutls_protocol_deps="gnutls"
 +tls_gnutls_protocol_deps="gnutls !tls_schannel_protocol !tls_securetransport_protocol"
  tls_gnutls_protocol_select="tcp_protocol"
 -tls_openssl_protocol_deps="openssl !tls_gnutls_protocol"
 +tls_openssl_protocol_deps="openssl !tls_schannel_protocol !tls_securetransport_protocol !tls_gnutls_protocol"
  tls_openssl_protocol_select="tcp_protocol"
 -tls_protocol_deps_any="tls_gnutls_protocol tls_openssl_protocol"
 +tls_schannel_protocol_deps="schannel"
 +tls_schannel_protocol_select="tcp_protocol"
 +tls_securetransport_protocol_deps="securetransport"
 +tls_securetransport_protocol_select="tcp_protocol"
 +tls_protocol_deps_any="tls_schannel_protocol tls_securetransport_protocol tls_gnutls_protocol tls_openssl_protocol"
  udp_protocol_select="network"
 +udplite_protocol_select="network"
  unix_protocol_deps="sys_un_h"
  unix_protocol_select="network"
  
diff --cc libavformat/Makefile
index 4bae3b7,c405354..51260f4
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -54,13 -52,11 +54,13 @@@ OBJS-$(CONFIG_RTPDEC
                                              rtpdec_qdm2.o               \
                                              rtpdec_qt.o                 \
                                              rtpdec_svq3.o               \
 +                                            rtpdec_vc2hq.o              \
                                              rtpdec_vp8.o                \
                                              rtpdec_vp9.o                \
-                                             rtpdec_xiph.o               \
-                                             srtp.o
+                                             rtpdec_xiph.o
  OBJS-$(CONFIG_RTPENC_CHAIN)              += rtpenc_chain.o rtp.o
 +OBJS-$(CONFIG_SHARED)                    += log2_tab.o golomb_tab.o
+ OBJS-$(CONFIG_SRTP)                      += srtp.o
  
  # muxers/demuxers
  OBJS-$(CONFIG_A64_MUXER)                 += a64.o rawenc.o
@@@ -573,9 -416,7 +573,8 @@@ SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOC
  SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
  
  TESTPROGS = seek                                                        \
-             srtp                                                        \
              url                                                         \
 +#           async                                                       \
  
  TESTPROGS-$(CONFIG_MOV_MUXER)            += movenc
  TESTPROGS-$(CONFIG_NETWORK)              += noproxy