mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-12-30 15:33:41 +00:00
hls: Add and use a memebr of AVIOInternal rather than abuse opaque
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
parent
3acbb91d13
commit
9f9ed79d4c
libavformat
@ -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,
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user