avformat/http: add crypto to default whitlist to get encrypted HLS working again
authorSchenk, Michael <Michael.Schenk@albistechnologies.com>
Wed, 3 Feb 2016 13:18:15 +0000 (13:18 +0000)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 3 Feb 2016 14:57:43 +0000 (15:57 +0100)
commit93f4b41208fb6a38ea53e06ecc5b299748ec2ffc
treeabf2c24c4e0c6bd574790ab3b5cf3d0d65c9887c
parentca71e6052e86d2d6eb390d642596d2474b524b3d
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>
libavformat/http.c