From 22ef5ee8ac440a17fff5f2c0bbc40171d863777b Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 3 Jul 2016 14:06:28 -0700 Subject: ffmpeg: Fix TLS protocols in protocols.awk --- media/ffmpeg/gen.rc | 4 ++-- media/ffmpeg/protocols.awk | 8 ++++---- 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") -- cgit v1.2.3