RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/hlsproto: use ff_get_chomp_line 

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
This commit is contained in:
Jun Zhao 2018-04-09 23:13:03 +08:00 committed by Jun Zhao
parent f1ccb4dbcf
commit 52623bc26f
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/hlsproto.c
View File

@ -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;