diff options
| author | Schenk, Michael <Michael.Schenk@albistechnologies.com> | 2016-02-03 13:18:15 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-03 15:57:43 +0100 |
| commit | 93f4b41208fb6a38ea53e06ecc5b299748ec2ffc (patch) | |
| tree | abf2c24c4e0c6bd574790ab3b5cf3d0d65c9887c | |
| parent | ca71e6052e86d2d6eb390d642596d2474b524b3d (diff) | |
| download | ffmpeg-93f4b41208fb6a38ea53e06ecc5b299748ec2ffc.tar.gz | |
avformat/http: add crypto to default whitlist to get encrypted HLS working again
I think we missed the crypto in the default_whitelist in case of http. Otherwise encrypted HLS will fail with
[hls,applehttp @ 0x2af39c00] playlist[0] open_input [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts], start_seq_no [1], cur_seq_no [14]
[hls,applehttp @ 0x2af39c00] open_input curseqno [14] startseqno [1]
[hls,applehttp @ 0x2af39c00] HLS request for url 'http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts', offset 0, playlist 0
[NULL @ 0x2af3a200] KEY_AES_128 seg->key [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key] pls->key_url [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key]
[hls,applehttp @ 0x2af39c00] open_input [KEY_AES_128]
[hls,applehttp @ 0x2af39c00] : c->persistence [0]
[hls,applehttp @ 0x2af39c00] : c->probing [1]
[hls,applehttp @ 0x2af39c00] : pls->input [NULL]
[hls,applehttp @ 0x2af39c00] using normal http path for URL [crypto+http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts]
[crypto @ 0x2aff7cc0] Protocol not on whitelist 'http,https,tls,rtp,tcp,udp!
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index a06e36671e..d1b91e23d6 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1522,7 +1522,7 @@ URLProtocol ff_http_protocol = { .priv_data_size = sizeof(HTTPContext), .priv_data_class = &http_context_class, .flags = URL_PROTOCOL_FLAG_NETWORK, - .default_whitelist = "http,https,tls,rtp,tcp,udp" + .default_whitelist = "http,https,tls,rtp,tcp,udp,crypto" }; #endif /* CONFIG_HTTP_PROTOCOL */ @@ -1541,7 +1541,7 @@ URLProtocol ff_https_protocol = { .priv_data_size = sizeof(HTTPContext), .priv_data_class = &https_context_class, .flags = URL_PROTOCOL_FLAG_NETWORK, - .default_whitelist = "http,https,tls,rtp,tcp,udp" + .default_whitelist = "http,https,tls,rtp,tcp,udp,crypto" }; #endif /* CONFIG_HTTPS_PROTOCOL */ |