har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf/hls: use ff_get_chomp_line

Browse Source 
Signed-off-by: Jun Zhao <mypopydev@gmail.com>
This commit is contained in:
Jun Zhao 2018-04-09 23:11:02 +08:00 committed by Jun Zhao
parent cdd107b965
commit 0e49118271
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/hls.c
View File

@ -216,14 +216,6 @@ typedef struct HLSContext {
AVIOContext *playlist_pb; AVIOContext *playlist_pb;
} HLSContext; } 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(struct playlist *pls) static void free_segment_list(struct playlist *pls)
{ {
int i; int i;
@ -770,7 +762,7 @@ static int parse_playlist(HLSContext *c, const char *url,
if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, &new_url) >= 0) if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, &new_url) >= 0)
url = new_url; url = new_url;
read_chomp_line(in, line, sizeof(line)); ff_get_chomp_line(in, line, sizeof(line));
if (strcmp(line, "#EXTM3U")) { if (strcmp(line, "#EXTM3U")) {
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto fail; goto fail;
@ -782,7 +774,7 @@ static int parse_playlist(HLSContext *c, const char *url,
pls->type = PLS_TYPE_UNSPECIFIED; pls->type = PLS_TYPE_UNSPECIFIED;
} }
while (!avio_feof(in)) { 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)) { if (av_strstart(line, "#EXT-X-STREAM-INF:", &ptr)) {
is_variant = 1; is_variant = 1;
memset(&variant_info, 0, sizeof(variant_info)); memset(&variant_info, 0, sizeof(variant_info));