ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Mon Mar 14 12:19:31 2016 +0100| [eae2d89bf715bc3edff478174b43e1f388e768bf] | committer: Hendrik Leppkes
hls: handle crypto in the protocol checks Fixes issue 5248 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eae2d89bf715bc3edff478174b43e1f388e768bf --- libavformat/hls.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 714d1e0..fb87954 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -594,12 +594,20 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, { HLSContext *c = s->priv_data; AVDictionary *tmp = NULL; - const char *proto_name = avio_find_protocol_name(url); + const char *proto_name = NULL; int ret; av_dict_copy(&tmp, opts, 0); av_dict_copy(&tmp, opts2, 0); + if (av_strstart(url, "crypto", NULL)) { + if (url[6] == '+' || url[6] == ':') + proto_name = avio_find_protocol_name(url + 7); + } + + if (!proto_name) + proto_name = avio_find_protocol_name(url); + if (!proto_name) return AVERROR_INVALIDDATA; @@ -608,6 +616,8 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, return AVERROR_INVALIDDATA; if (!strncmp(proto_name, url, strlen(proto_name)) && url[strlen(proto_name)] == ':') ; + else if (av_strstart(url, "crypto", NULL) && !strncmp(proto_name, url + 7, strlen(proto_name)) && url[7 + strlen(proto_name)] == ':') + ; else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5)) return AVERROR_INVALIDDATA; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
