summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-07-03 14:06:28 -0700
committerMichael Forney <mforney@mforney.org>2016-07-03 14:06:28 -0700
commit22ef5ee8ac440a17fff5f2c0bbc40171d863777b (patch)
treef0ab32dc7e1f3d5ed008e418895ee2b09381f952
parent8e74e8ef7469d92e0bb060f9ac4eee5b633face1 (diff)
ffmpeg: Fix TLS protocols in protocols.awk
-rw-r--r--media/ffmpeg/gen.rc4
-rw-r--r--media/ffmpeg/protocols.awk8
2 files changed, 6 insertions, 6 deletions
diff --git a/media/ffmpeg/gen.rc b/media/ffmpeg/gen.rc
index bd42de8d..33d1ccaf 100644
--- a/media/ffmpeg/gen.rc
+++ b/media/ffmpeg/gen.rc
@@ -21,9 +21,9 @@ gen_inputs='$dir'/^(sources.awk sources.txt options.h)
build '$outdir'/config.asm awk '$dir'/options.h ; with\
expr '''{print "%define " substr($$0, length("#define ") + 1)}'''
-build '$outdir'/internal/libavcodec/bsf_list.c awk '$dir'/options.h ; with\
+build '$outdir'/internal/libavcodec/bsf_list.c awk '$dir'/options.h '|' '$dir'/bitstream_filters.awk ; with\
expr '-f $dir/bitstream_filters.awk'
-build '$outdir'/internal/libavformat/protocol_list.c awk '$dir'/options.h ; with\
+build '$outdir'/internal/libavformat/protocol_list.c awk '$dir'/options.h '|' '$dir'/protocols.awk ; with\
expr '-f $dir/protocols.awk'
build '$outdir'/include/libavutil/avconfig.h awk '$dir'/options.h ; with\
expr '-f $dir/avconfig.awk'
diff --git a/media/ffmpeg/protocols.awk b/media/ffmpeg/protocols.awk
index b5d6cb64..49bd309d 100644
--- a/media/ffmpeg/protocols.awk
+++ b/media/ffmpeg/protocols.awk
@@ -40,10 +40,10 @@ END {
proto("srtp")
proto("subfile")
proto("tcp")
- proto("tls")
- proto("tls")
- proto("tls")
- proto("tls")
+ proto("tls_gnutls")
+ proto("tls_schannel")
+ proto("tls_securetransport")
+ proto("tls_openssl")
proto("udp")
proto("udplite")
proto("unix")