external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge from srs2.

Browse source
This commit is contained in:
winlin 2015-12-11 11:35:56 +08:00
commit ffef3905af
5 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_hls.cpp
View file

@ -557,6 +557,12 @@ int SrsHlsMuxer::segment_open(int64_t segment_start_dts)
current->uri += hls_entry_prefix;
if (!hls_entry_prefix.empty() && !srs_string_ends_with(hls_entry_prefix, "/")) {
current->uri += "/";
// add the http dir to uri.
string http_dir = srs_path_dirname(m3u8_url);
if (!http_dir.empty()) {
current->uri += http_dir + "/";
}
}
current->uri += ts_url;