Merge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477'

* commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477':
  Generate the lists of enabled protocols/bsfs from configure.

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

1 files changed, 1 insertions, 140 deletions

diff --git a/libavformat/protocols.c b/libavformat/protocols.c
index 77cd3a4a5c..124010cced 100644
--- a/libavformat/protocols.c
+++ b/libavformat/protocols.c
@@ -69,146 +69,7 @@ extern const URLProtocol ff_librtmpte_protocol;
 extern const URLProtocol ff_libssh_protocol;
 extern const URLProtocol ff_libsmbclient_protocol;
 
-static const URLProtocol *url_protocols[] = {
-#if CONFIG_ASYNC_PROTOCOL
-    &ff_async_protocol,
-#endif
-#if CONFIG_BLURAY_PROTOCOL
-    &ff_bluray_protocol,
-#endif
-#if CONFIG_CACHE_PROTOCOL
-    &ff_cache_protocol,
-#endif
-#if CONFIG_CONCAT_PROTOCOL
-    &ff_concat_protocol,
-#endif
-#if CONFIG_CRYPTO_PROTOCOL
-    &ff_crypto_protocol,
-#endif
-#if CONFIG_DATA_PROTOCOL
-    &ff_data_protocol,
-#endif
-#if CONFIG_FFRTMPCRYPT_PROTOCOL
-    &ff_ffrtmpcrypt_protocol,
-#endif
-#if CONFIG_FFRTMPHTTP_PROTOCOL
-    &ff_ffrtmphttp_protocol,
-#endif
-#if CONFIG_FILE_PROTOCOL
-    &ff_file_protocol,
-#endif
-#if CONFIG_FTP_PROTOCOL
-    &ff_ftp_protocol,
-#endif
-#if CONFIG_GOPHER_PROTOCOL
-    &ff_gopher_protocol,
-#endif
-#if CONFIG_HLS_PROTOCOL
-    &ff_hls_protocol,
-#endif
-#if CONFIG_HTTP_PROTOCOL
-    &ff_http_protocol,
-#endif
-#if CONFIG_HTTPPROXY_PROTOCOL
-    &ff_httpproxy_protocol,
-#endif
-#if CONFIG_HTTPS_PROTOCOL
-    &ff_https_protocol,
-#endif
-#if CONFIG_ICECAST_PROTOCOL
-    &ff_icecast_protocol,
-#endif
-#if CONFIG_MMSH_PROTOCOL
-    &ff_mmsh_protocol,
-#endif
-#if CONFIG_MMST_PROTOCOL
-    &ff_mmst_protocol,
-#endif
-#if CONFIG_MD5_PROTOCOL
-    &ff_md5_protocol,
-#endif
-#if CONFIG_PIPE_PROTOCOL
-    &ff_pipe_protocol,
-#endif
-#if CONFIG_RTMP_PROTOCOL
-    &ff_rtmp_protocol,
-#endif
-#if CONFIG_RTMPE_PROTOCOL
-    &ff_rtmpe_protocol,
-#endif
-#if CONFIG_RTMPS_PROTOCOL
-    &ff_rtmps_protocol,
-#endif
-#if CONFIG_RTMPT_PROTOCOL
-    &ff_rtmpt_protocol,
-#endif
-#if CONFIG_RTMPTE_PROTOCOL
-    &ff_rtmpte_protocol,
-#endif
-#if CONFIG_RTMPTS_PROTOCOL
-    &ff_rtmpts_protocol,
-#endif
-#if CONFIG_RTP_PROTOCOL
-    &ff_rtp_protocol,
-#endif
-#if CONFIG_SCTP_PROTOCOL
-    &ff_sctp_protocol,
-#endif
-#if CONFIG_SRTP_PROTOCOL
-    &ff_srtp_protocol,
-#endif
-#if CONFIG_SUBFILE_PROTOCOL
-    &ff_subfile_protocol,
-#endif
-#if CONFIG_TCP_PROTOCOL
-    &ff_tcp_protocol,
-#endif
-#if CONFIG_TLS_GNUTLS_PROTOCOL
-    &ff_tls_gnutls_protocol,
-#endif
-#if CONFIG_TLS_SCHANNEL_PROTOCOL
-    &ff_tls_schannel_protocol,
-#endif
-#if CONFIG_TLS_SECURETRANSPORT_PROTOCOL
-    &ff_tls_securetransport_protocol,
-#endif
-#if CONFIG_TLS_OPENSSL_PROTOCOL
-    &ff_tls_openssl_protocol,
-#endif
-#if CONFIG_UDP_PROTOCOL
-    &ff_udp_protocol,
-#endif
-#if CONFIG_UDPLITE_PROTOCOL
-    &ff_udplite_protocol,
-#endif
-#if CONFIG_UNIX_PROTOCOL
-    &ff_unix_protocol,
-#endif
-
-    /* external libraries */
-#if CONFIG_LIBRTMP_PROTOCOL
-    &ff_librtmp_protocol,
-#endif
-#if CONFIG_LIBRTMPE_PROTOCOL
-    &ff_librtmpe_protocol,
-#endif
-#if CONFIG_LIBRTMPS_PROTOCOL
-    &ff_librtmps_protocol,
-#endif
-#if CONFIG_LIBRTMPT_PROTOCOL
-    &ff_librtmpt_protocol,
-#endif
-#if CONFIG_LIBRTMPTE_PROTOCOL
-    &ff_librtmpte_protocol,
-#endif
-#if CONFIG_LIBSSH_PROTOCOL
-    &ff_libssh_protocol,
-#endif
-#if CONFIG_LIBSMBCLIENT_PROTOCOL
-    &ff_libsmbclient_protocol,
-#endif
-    NULL,
-};
+#include "libavformat/protocol_list.c"
 
 const AVClass *ff_urlcontext_child_class_next(const AVClass *prev)
 {