diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2016-09-24 09:29:03 +0300 |
|---|---|---|
| committer | Anssi Hannula <anssi.hannula@iki.fi> | 2016-09-24 09:49:26 +0300 |
| commit | 748a4747da5a9fce15efb95b2d650d647cb98c1d (patch) | |
| tree | 336c74bcf36a22080c6e01cb73d44041084c901c | |
| parent | 6fc29572fbf82148e39b18d676688af6d9c17e2f (diff) | |
| download | ffmpeg-748a4747da5a9fce15efb95b2d650d647cb98c1d.tar.gz | |
avformat/hls: Fix handling of EXT-X-BYTERANGE streams over 2GB
Replace uses of atoi() with strtoll() when trying to read values into
int64_t variables.
Fixes Kodi trac #16926:
http://trac.kodi.tv/ticket/16926
(cherry picked from commit a6f5e25ad989550dff9493311d6ba08d882df079)
| -rw-r--r-- | libavformat/hls.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 59f5e38f9f..72415320d4 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -416,10 +416,10 @@ static struct segment *new_init_section(struct playlist *pls, } if (info->byterange[0]) { - sec->size = atoi(info->byterange); + sec->size = strtoll(info->byterange, NULL, 10); ptr = strchr(info->byterange, '@'); if (ptr) - sec->url_offset = atoi(ptr+1); + sec->url_offset = strtoll(ptr+1, NULL, 10); } else { /* the entire file is the init section */ sec->size = -1; @@ -731,7 +731,7 @@ static int parse_playlist(HLSContext *c, const char *url, ret = ensure_playlist(c, &pls, url); if (ret < 0) goto fail; - pls->target_duration = atoi(ptr) * AV_TIME_BASE; + pls->target_duration = strtoll(ptr, NULL, 10) * AV_TIME_BASE; } else if (av_strstart(line, "#EXT-X-MEDIA-SEQUENCE:", &ptr)) { ret = ensure_playlist(c, &pls, url); if (ret < 0) @@ -760,10 +760,10 @@ static int parse_playlist(HLSContext *c, const char *url, is_segment = 1; duration = atof(ptr) * AV_TIME_BASE; } else if (av_strstart(line, "#EXT-X-BYTERANGE:", &ptr)) { - seg_size = atoi(ptr); + seg_size = strtoll(ptr, NULL, 10); ptr = strchr(ptr, '@'); if (ptr) - seg_offset = atoi(ptr+1); + seg_offset = strtoll(ptr+1, NULL, 10); } else if (av_strstart(line, "#", NULL)) { continue; } else if (line[0]) { |