diff options
| author | Aman Gupta <aman@tmm1.net> | 2017-12-30 02:30:55 +0300 |
|---|---|---|
| committer | Aman Gupta <aman@tmm1.net> | 2017-12-31 08:07:55 +0300 |
| commit | 97b89432e4566a5d620f97bfdf4c8ae9c83d94e8 (patch) | |
| tree | 873b348200100758571264c7caace25f14021d11 /libavformat/hls.c | |
| parent | 903be5e4f66268273dc6e3c42a7fdeaab32066ef (diff) | |
avformat/hls: ignore http_persistent for segments requring crypto
Encrypted HLS segments have regular http:// urls, but open_input()
actually prefixes them with crypto+ before calling open_url(), so
they end up using the crypto protocol and not the http protocol.
This means invoking ff_http_do_new_request will fail, so we avoid
calling it in the first place. After the earlier http.c commit,
the failure results in a warning printed to the user. In earlier
versions, the failure would cause a segfault.
Signed-off-by: Aman Gupta <aman@tmm1.net>
Diffstat (limited to 'libavformat/hls.c')
| -rw-r--r-- | libavformat/hls.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index dccc7c7dd2..d9f7c6de4d 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1479,7 +1479,7 @@ reload: seg = next_segment(v); if (c->http_multiple == 1 && !v->input_next_requested && - seg && av_strstart(seg->url, "http", NULL)) { + seg && seg->key_type == KEY_NONE && av_strstart(seg->url, "http", NULL)) { ret = open_input(c, v, seg, &v->input_next); if (ret < 0) { if (ff_check_interrupt(c->interrupt_callback)) @@ -1511,7 +1511,8 @@ reload: return ret; } - if (c->http_persistent && av_strstart(seg->url, "http", NULL)) { + if (c->http_persistent && + seg->key_type == KEY_NONE && av_strstart(seg->url, "http", NULL)) { v->input_read_done = 1; } else { ff_format_io_close(v->parent, &v->input); |