hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	lib/ts_packet.cpp
This commit is contained in:
Thulinma 2016-06-28 17:06:57 +02:00
commit ad21d1570f
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ts_packet.cpp
View file

@ -999,6 +999,7 @@ namespace TS {
ProgramMappingEntry entry = PMT.getEntry(0); ProgramMappingEntry entry = PMT.getEntry(0);
for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){ for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
entry.setElementaryPid(256 + *it); entry.setElementaryPid(256 + *it);
entry.setESInfo("");
if (myMeta.tracks[*it].codec == "H264"){ if (myMeta.tracks[*it].codec == "H264"){
entry.setStreamType(0x1B); entry.setStreamType(0x1B);
}else if (myMeta.tracks[*it].codec == "HEVC"){ }else if (myMeta.tracks[*it].codec == "HEVC"){