diff options
| author | siriuzwhite <siriuz@gmx.net> | 2013-11-10 23:26:16 +0100 |
|---|---|---|
| committer | siriuzwhite <siriuz@gmx.net> | 2013-12-09 01:49:05 +0100 |
| commit | d6cd48cbd68c7c0ee00bddfbc5a159b4f246b308 (patch) | |
| tree | acb119dcb52a84538d643a7654cfab35ee206238 /lib | |
| parent | d6bd76cb1f89f69858e8242f03f1a73c308aae9a (diff) | |
[backport] fixed ffmpeg not keep custom http headers when playing hls stream
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ffmpeg/libavformat/hls.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/ffmpeg/libavformat/hls.c b/lib/ffmpeg/libavformat/hls.c index 7de6059c5a..2bfb6804fe 100644 --- a/lib/ffmpeg/libavformat/hls.c +++ b/lib/ffmpeg/libavformat/hls.c @@ -105,6 +105,7 @@ typedef struct HLSContext { AVIOInterruptCB *interrupt_callback; char *user_agent; ///< holds HTTP user agent set as an AVOption to the HTTP protocol context char *cookies; ///< holds HTTP cookie values set in either the initial response or as an AVOption to the HTTP protocol context + char *headers; ///< holds HTTP headers set as an AVOption to the HTTP protocol context (kow|mitm) } HLSContext; static int read_chomp_line(AVIOContext *s, char *buf, int maxlen) @@ -224,6 +225,7 @@ static int parse_playlist(HLSContext *c, const char *url, // broker prior HTTP options that should be consistent across requests av_dict_set(&opts, "user-agent", c->user_agent, 0); av_dict_set(&opts, "cookies", c->cookies, 0); + av_dict_set(&opts, "headers", c->headers, 0); // (kow|mitm) ret = avio_open2(&in, url, AVIO_FLAG_READ, c->interrupt_callback, &opts); @@ -346,6 +348,7 @@ static int open_input(HLSContext *c, struct variant *var) // broker prior HTTP options that should be consistent across requests av_dict_set(&opts, "user-agent", c->user_agent, 0); av_dict_set(&opts, "cookies", c->cookies, 0); + av_dict_set(&opts, "headers", c->headers, 0); // (kow|mitm) av_dict_set(&opts, "seekable", "0", 0); if (seg->key_type == KEY_NONE) { @@ -494,6 +497,12 @@ static int hls_read_header(AVFormatContext *s) av_opt_get(u->priv_data, "cookies", 0, (uint8_t**)&(c->cookies)); if (c->cookies && !strlen(c->cookies)) av_freep(&c->cookies); + + // get the previous headers & set back to null if string size is zero (kow|mitm) + av_freep(&c->headers); + av_opt_get(u->priv_data, "headers", 0, (uint8_t**)&(c->headers)); + if (c->headers && !strlen(c->headers)) + av_freep(&c->headers); } if ((ret = parse_playlist(c, s->filename, NULL, s->pb)) < 0) |