diff options
author | Karthick Jeyapal <kjeyapal@akamai.com> | 2017-12-29 18:11:09 +0800 |
---|---|---|
committer | Steven Liu <lq@chinaffmpeg.org> | 2017-12-29 18:11:09 +0800 |
commit | e8f71ef338998458bbbaf09a11bc07f07fbc7954 (patch) | |
tree | b998e620eef9ae604b88fc1efb96d16b3b102d18 /libavformat/hlsenc.c | |
parent | 5297ae96a13f615431c9a4cc38cac13c4140b07e (diff) |
avformat/hlsenc, utils: Moved is_http_proto from hlsenc to utils for re-use
Reviewed-by: Aman Gupta <aman@tmm1.net>
Reviewed-by: Steven Liu <lq@onvideo.cn>
Diffstat (limited to 'libavformat/hlsenc.c')
-rw-r--r-- | libavformat/hlsenc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 5cff3b4bf6..e6f3241765 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -241,15 +241,10 @@ static int mkdir_p(const char *path) { return ret; } -static int is_http_proto(char *filename) { - const char *proto = avio_find_protocol_name(filename); - return proto ? (!av_strcasecmp(proto, "http") || !av_strcasecmp(proto, "https")) : 0; -} - static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, AVDictionary **options) { HLSContext *hls = s->priv_data; - int http_base_proto = filename ? is_http_proto(filename) : 0; + int http_base_proto = filename ? ff_is_http_proto(filename) : 0; int err = AVERROR_MUXER_NOT_FOUND; if (!*pb || !http_base_proto || !hls->http_persistent) { err = s->io_open(s, pb, filename, AVIO_FLAG_WRITE, options); @@ -265,8 +260,7 @@ static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) { HLSContext *hls = s->priv_data; - int http_base_proto = filename ? is_http_proto(filename) : 0; - + int http_base_proto = filename ? ff_is_http_proto(filename) : 0; if (!http_base_proto || !hls->http_persistent || hls->key_info_file || hls->encrypt) { ff_format_io_close(s, pb); #if CONFIG_HTTP_PROTOCOL @@ -281,7 +275,7 @@ static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename static void set_http_options(AVFormatContext *s, AVDictionary **options, HLSContext *c) { - int http_base_proto = is_http_proto(s->filename); + int http_base_proto = ff_is_http_proto(s->filename); if (c->method) { av_dict_set(options, "method", c->method, 0); |