summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libavformat/avio_internal.h5
-rw-r--r--libavformat/aviobuf.c4
-rw-r--r--libavformat/hls.c6
3 files changed, 9 insertions, 6 deletions
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index 54bdfa1..1e2a18e 100644
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -24,6 +24,11 @@
#include "libavutil/log.h"
+typedef struct AVIOInternal {
+ URLContext *h;
+ void *hlsopts;
+} AVIOInternal;
+
extern const AVClass ff_avio_class;
int ffio_init_context(AVIOContext *s,
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 6fc8745..e45afd1 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -42,10 +42,6 @@
*/
#define SHORT_SEEK_THRESHOLD 4096
-typedef struct AVIOInternal {
- URLContext *h;
-} AVIOInternal;
-
static void *ff_avio_child_next(void *obj, void *prev)
{
AVIOContext *s = obj;
diff --git a/libavformat/hls.c b/libavformat/hls.c
index aa5d60e..1715445 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -614,7 +614,8 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp);
if (ret >= 0) {
// update cookies on http response with setcookies.
- void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque;
+ AVIOInternal *internal = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque;
+ void *u = internal ? internal->hlsopts : NULL;
update_options(&c->cookies, "cookies", u);
av_dict_set(&opts, "cookies", c->cookies, 0);
}
@@ -1496,7 +1497,8 @@ static int nested_io_open(AVFormatContext *s, AVIOContext **pb, const char *url,
static int hls_read_header(AVFormatContext *s)
{
- void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque;
+ AVIOInternal *internal = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque;
+ void *u = internal ? internal->hlsopts : NULL;
HLSContext *c = s->priv_data;
int ret = 0, i, j, stream_offset = 0;
OpenPOWER on IntegriCloud