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

avformat/hlsenc: hold old key info when append list 

fix ticket id: #6353

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Steven Liu 2017-04-28 10:17:40 +08:00
parent f7542d7e35
commit 363e4f0810
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/hlsenc.c
View File

@ -810,6 +810,7 @@ static int parse_playlist(AVFormatContext *s, const char *url)
int64_t new_start_pos; int64_t new_start_pos;
char line[1024]; char line[1024];
const char *ptr; const char *ptr;
const char *end;
if ((ret = ffio_open_whitelist(&in, url, AVIO_FLAG_READ, if ((ret = ffio_open_whitelist(&in, url, AVIO_FLAG_READ,
&s->interrupt_callback, NULL, &s->interrupt_callback, NULL,
@ -842,6 +843,29 @@ static int parse_playlist(AVFormatContext *s, const char *url)
} else if (av_strstart(line, "#EXTINF:", &ptr)) { } else if (av_strstart(line, "#EXTINF:", &ptr)) {
is_segment = 1; is_segment = 1;
hls->duration = atof(ptr); hls->duration = atof(ptr);
} else if (av_stristart(line, "#EXT-X-KEY:", &ptr)) {
ptr = av_stristr(line, "URI=\"");
if (ptr) {
ptr += strlen("URI=\"");
end = av_stristr(ptr, ",");
if (end) {
av_strlcpy(hls->key_uri, ptr, end - ptr);
} else {
av_strlcpy(hls->key_uri, ptr, sizeof(hls->key_uri));
}
}
ptr = av_stristr(line, "IV=0x");
if (ptr) {
ptr += strlen("IV=0x");
end = av_stristr(ptr, ",");
if (end) {
av_strlcpy(hls->iv_string, ptr, end - ptr);
} else {
av_strlcpy(hls->iv_string, ptr, sizeof(hls->iv_string));
}
}
} else if (av_strstart(line, "#", NULL)) { } else if (av_strstart(line, "#", NULL)) {
continue; continue;
} else if (line[0]) { } else if (line[0]) {