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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2017-07-25 15:57:01 +02:00
commit f3cc7b0a4e
4 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/input/input_h264.cpp
View file

@ -116,7 +116,7 @@ namespace Mist{
uint64_t ts = Util::bootMS() - startTime;
if (myMeta.tracks[1].fpks){ts = frameCount * (1000000 / myMeta.tracks[1].fpks);}
thisPacket.genericFill(ts, 0, 1, 0, 0, 0, h264::isKeyframe(NAL.data(), nalSize));
thisPacket.appendNal(NAL.data(), nalSize, nalSize);
thisPacket.appendNal(NAL.data(), nalSize);
++frameCount;
return;
}