Commit d6489ddb authored by Jun Zhao's avatar Jun Zhao

lavf/hls: Remove HLSContext.strict_std_compliance field

After the commit 9f61abc8, we can use AVFormatContext.strict_std_compliance
instead of HLSContext.strict_std_compliance to avoid the code redundancy.
Signed-off-by: 's avatarJun Zhao <barryjzhao@tencent.com>
parent 4b7166c9
...@@ -203,7 +203,6 @@ typedef struct HLSContext { ...@@ -203,7 +203,6 @@ typedef struct HLSContext {
int64_t cur_timestamp; int64_t cur_timestamp;
AVIOInterruptCB *interrupt_callback; AVIOInterruptCB *interrupt_callback;
AVDictionary *avio_opts; AVDictionary *avio_opts;
int strict_std_compliance;
char *allowed_extensions; char *allowed_extensions;
int max_reload; int max_reload;
int http_persistent; int http_persistent;
...@@ -485,7 +484,7 @@ static struct rendition *new_rendition(HLSContext *c, struct rendition_info *inf ...@@ -485,7 +484,7 @@ static struct rendition *new_rendition(HLSContext *c, struct rendition_info *inf
return NULL; return NULL;
/* TODO: handle subtitles (each segment has to parsed separately) */ /* TODO: handle subtitles (each segment has to parsed separately) */
if (c->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) if (c->ctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL)
if (type == AVMEDIA_TYPE_SUBTITLE) if (type == AVMEDIA_TYPE_SUBTITLE)
return NULL; return NULL;
...@@ -1786,7 +1785,6 @@ static int hls_read_header(AVFormatContext *s) ...@@ -1786,7 +1785,6 @@ static int hls_read_header(AVFormatContext *s)
c->ctx = s; c->ctx = s;
c->interrupt_callback = &s->interrupt_callback; c->interrupt_callback = &s->interrupt_callback;
c->strict_std_compliance = s->strict_std_compliance;
c->first_packet = 1; c->first_packet = 1;
c->first_timestamp = AV_NOPTS_VALUE; c->first_timestamp = AV_NOPTS_VALUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment