[FFmpeg-devel] [PATCH 3/3] hls: handle crypto in the protocol checks

[Schenk, Michael]

Dear friends,

from my point of view the patch looks ok. I was just about to submit something similar because it run into the same
problem (not working AES encrypted HLS).

Regards

Michael



-----Ursprüngliche Nachricht-----
Von: ffmpeg-devel [mailto:ffmpeg-devel-bounces at ffmpeg.org] Im Auftrag von Hendrik Leppkes
Gesendet: Montag, 14. März 2016 12:23
An: ffmpeg-devel at ffmpeg.org
Betreff: [FFmpeg-devel] [PATCH 3/3] hls: handle crypto in the protocol checks

Fixes issue 5248
---
 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;
 
--
2.7.2.windows.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel at ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel