diff options
| author | Jun Zhao <mypopydev@gmail.com> | 2018-04-09 23:13:03 +0800 |
|---|---|---|
| committer | Jun Zhao <jun.zhao@intel.com> | 2018-04-12 16:04:58 +0800 |
| commit | 52623bc26fc49a1335a7ba4aab6ddb2b6588c105 (patch) | |
| tree | 82a1683d259a38de8c91e699176e62b6a281a33f /libavformat | |
| parent | f1ccb4dbcf0b878120ba3990476ce7059ead2d74 (diff) | |
| download | ffmpeg-52623bc26fc49a1335a7ba4aab6ddb2b6588c105.tar.gz | |
lavf/hlsproto: use ff_get_chomp_line
Signed-off-by: Jun Zhao <mypopydev@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/hlsproto.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c index 2b19ed0cf6..e7ef2d88ea 100644 --- a/libavformat/hlsproto.c +++ b/libavformat/hlsproto.c @@ -69,14 +69,6 @@ typedef struct HLSContext { int64_t last_load_time; } HLSContext; -static int read_chomp_line(AVIOContext *s, char *buf, int maxlen) -{ - int len = ff_get_line(s, buf, maxlen); - while (len > 0 && av_isspace(buf[len - 1])) - buf[--len] = '\0'; - return len; -} - static void free_segment_list(HLSContext *s) { int i; @@ -122,7 +114,7 @@ static int parse_playlist(URLContext *h, const char *url) h->protocol_whitelist, h->protocol_blacklist)) < 0) return ret; - read_chomp_line(in, line, sizeof(line)); + ff_get_chomp_line(in, line, sizeof(line)); if (strcmp(line, "#EXTM3U")) { ret = AVERROR_INVALIDDATA; goto fail; @@ -131,7 +123,7 @@ static int parse_playlist(URLContext *h, const char *url) free_segment_list(s); s->finished = 0; while (!avio_feof(in)) { - read_chomp_line(in, line, sizeof(line)); + ff_get_chomp_line(in, line, sizeof(line)); if (av_strstart(line, "#EXT-X-STREAM-INF:", &ptr)) { struct variant_info info = {{0}}; is_variant = 1; |