diff options
| author | Aman Gupta <aman@tmm1.net> | 2017-12-26 14:29:03 -0800 |
|---|---|---|
| committer | Aman Gupta <aman@tmm1.net> | 2017-12-26 14:48:13 -0800 |
| commit | 2f9ca64556cba9a7edcca9a1c55923a60022937d (patch) | |
| tree | d9ab8d9feaa7413ad062247b3d2752c8c15de30f /libavformat | |
| parent | 7e60c74329353db28db00552028bc88cd2a52346 (diff) | |
| download | ffmpeg-2f9ca64556cba9a7edcca9a1c55923a60022937d.tar.gz | |
avformat/hls: remove repeated http proto_name checks in open_url()
Signed-off-by: Aman Gupta <aman@tmm1.net>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/hls.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index f00e22dfef..d2cbb47f15 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -623,12 +623,13 @@ static int open_url_keepalive(AVFormatContext *s, AVIOContext **pb, } static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, - AVDictionary *opts, AVDictionary *opts2, int *is_http) + AVDictionary *opts, AVDictionary *opts2, int *is_http_out) { HLSContext *c = s->priv_data; AVDictionary *tmp = NULL; const char *proto_name = NULL; int ret; + int is_http = 0; av_dict_copy(&tmp, opts, 0); av_dict_copy(&tmp, opts2, 0); @@ -654,7 +655,7 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, return AVERROR_INVALIDDATA; } } else if (av_strstart(proto_name, "http", NULL)) { - ; + is_http = 1; } else return AVERROR_INVALIDDATA; @@ -665,7 +666,7 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5)) return AVERROR_INVALIDDATA; - if (c->http_persistent && *pb && av_strstart(proto_name, "http", NULL)) { + if (is_http && c->http_persistent && *pb) { ret = open_url_keepalive(c->ctx, pb, url); if (ret == AVERROR_EXIT) { return ret; @@ -696,8 +697,8 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, av_dict_free(&tmp); - if (is_http) - *is_http = av_strstart(proto_name, "http", NULL); + if (is_http_out) + *is_http_out = is_http; return ret; } |