mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'
* commit '65a802401c6cc136576bb2e613c0577cbf622aa8': build: Add component for the SRTP common code Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
commit
8f540b8612
|
@ -2066,6 +2066,7 @@ CONFIG_EXTRA="
|
||||||
rv34dsp
|
rv34dsp
|
||||||
sinewin
|
sinewin
|
||||||
snappy
|
snappy
|
||||||
|
srtp
|
||||||
startcode
|
startcode
|
||||||
texturedsp
|
texturedsp
|
||||||
texturedspenc
|
texturedspenc
|
||||||
|
@ -2789,7 +2790,7 @@ ogg_demuxer_select="dirac_parse"
|
||||||
opus_muxer_select="ogg_muxer"
|
opus_muxer_select="ogg_muxer"
|
||||||
psp_muxer_select="mov_muxer"
|
psp_muxer_select="mov_muxer"
|
||||||
rtp_demuxer_select="sdp_demuxer"
|
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_demuxer_select="http_protocol rtpdec"
|
||||||
rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain"
|
rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain"
|
||||||
sap_demuxer_select="sdp_demuxer"
|
sap_demuxer_select="sdp_demuxer"
|
||||||
|
@ -2896,7 +2897,7 @@ rtmpts_protocol_select="ffrtmphttp_protocol https_protocol"
|
||||||
rtp_protocol_select="udp_protocol"
|
rtp_protocol_select="udp_protocol"
|
||||||
sctp_protocol_deps="struct_sctp_event_subscribe struct_msghdr_msg_flags"
|
sctp_protocol_deps="struct_sctp_event_subscribe struct_msghdr_msg_flags"
|
||||||
sctp_protocol_select="network"
|
sctp_protocol_select="network"
|
||||||
srtp_protocol_select="rtp_protocol"
|
srtp_protocol_select="rtp_protocol srtp"
|
||||||
tcp_protocol_select="network"
|
tcp_protocol_select="network"
|
||||||
tls_gnutls_protocol_deps="gnutls !tls_schannel_protocol !tls_securetransport_protocol"
|
tls_gnutls_protocol_deps="gnutls !tls_schannel_protocol !tls_securetransport_protocol"
|
||||||
tls_gnutls_protocol_select="tcp_protocol"
|
tls_gnutls_protocol_select="tcp_protocol"
|
||||||
|
|
|
@ -57,10 +57,10 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \
|
||||||
rtpdec_vc2hq.o \
|
rtpdec_vc2hq.o \
|
||||||
rtpdec_vp8.o \
|
rtpdec_vp8.o \
|
||||||
rtpdec_vp9.o \
|
rtpdec_vp9.o \
|
||||||
rtpdec_xiph.o \
|
rtpdec_xiph.o
|
||||||
srtp.o
|
|
||||||
OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o
|
OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o
|
||||||
OBJS-$(CONFIG_SHARED) += log2_tab.o golomb_tab.o
|
OBJS-$(CONFIG_SHARED) += log2_tab.o golomb_tab.o
|
||||||
|
OBJS-$(CONFIG_SRTP) += srtp.o
|
||||||
|
|
||||||
# muxers/demuxers
|
# muxers/demuxers
|
||||||
OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o
|
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
|
SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
|
||||||
|
|
||||||
TESTPROGS = seek \
|
TESTPROGS = seek \
|
||||||
srtp \
|
|
||||||
url \
|
url \
|
||||||
# async \
|
# async \
|
||||||
|
|
||||||
TESTPROGS-$(CONFIG_MOV_MUXER) += movenc
|
TESTPROGS-$(CONFIG_MOV_MUXER) += movenc
|
||||||
TESTPROGS-$(CONFIG_NETWORK) += noproxy
|
TESTPROGS-$(CONFIG_NETWORK) += noproxy
|
||||||
TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh
|
TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh
|
||||||
|
TESTPROGS-$(CONFIG_SRTP) += srtp
|
||||||
|
|
||||||
TOOLS = aviocat \
|
TOOLS = aviocat \
|
||||||
ismindex \
|
ismindex \
|
||||||
|
|
Loading…
Reference in New Issue