generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hls: Add and use a memebr of AVIOInternal rather than abuse opaque

Browse Source 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-02-29 20:09:32 +00:00
parent 3acbb91d13
commit 9f9ed79d4c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avio_internal.h
View File

@ -24,6 +24,11 @@
#include "libavutil/log.h" #include "libavutil/log.h"
typedef struct AVIOInternal {
URLContext *h;
void *hlsopts;
} AVIOInternal;
extern const AVClass ff_avio_class; extern const AVClass ff_avio_class;
int ffio_init_context(AVIOContext *s, int ffio_init_context(AVIOContext *s,

4
libavformat/aviobuf.c
View File

@ -42,10 +42,6 @@
*/ */
#define SHORT_SEEK_THRESHOLD 4096 #define SHORT_SEEK_THRESHOLD 4096
typedef struct AVIOInternal {
URLContext *h;
} AVIOInternal;
static void *ff_avio_child_next(void *obj, void *prev) static void *ff_avio_child_next(void *obj, void *prev)
{ {
AVIOContext *s = obj; AVIOContext *s = obj;

6
libavformat/hls.c
View File

@ -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); ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp);
if (ret >= 0) { if (ret >= 0) {
// update cookies on http response with setcookies. // 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); update_options(&c->cookies, "cookies", u);
av_dict_set(&opts, "cookies", c->cookies, 0); 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) 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; HLSContext *c = s->priv_data;
int ret = 0, i, j, stream_offset = 0; int ret = 0, i, j, stream_offset = 0;