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/h264.h
This commit is contained in:
Thulinma 2017-06-09 20:14:23 +02:00
commit 416254304a
7 changed files with 108 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/h264.h
View file

@ -72,6 +72,8 @@ namespace h264 {
size_t dataLen;
};
bool isKeyframe(const char * data, uint32_t len);
class nalUnit {
public:
nalUnit(const char * data, size_t len) : payload(data, len) {}