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

Fixed some compile errors.

Browse source
This commit is contained in:
Thulinma 2014-04-05 01:03:09 +02:00
parent 3b7025019f
commit 5ece1d7471
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/input/input_buffer.cpp
View file

@ -39,7 +39,7 @@ namespace Mist {
} }
void inputBuffer::updateMeta(){ void inputBuffer::updateMeta(){
long long unsigned int firstms = 0xFFFFFFFFFFFFFFFF; long long unsigned int firstms = 0xFFFFFFFFFFFFFFFFull;
long long unsigned int lastms = 0; long long unsigned int lastms = 0;
for (std::map<int,DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){ for (std::map<int,DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
if (it->second.firstms < firstms){ if (it->second.firstms < firstms){
@ -206,7 +206,7 @@ namespace Mist {
int thisKeyNum = ((((long long int *)(indexPages[tNum].mapped + i))[0]) >> 32) & 0xFFFFFFFF; int thisKeyNum = ((((long long int *)(indexPages[tNum].mapped + i))[0]) >> 32) & 0xFFFFFFFF;
if (thisKeyNum == htonl(curPage)){ if (thisKeyNum == htonl(curPage)){
if((ntohl((((long long int*)(indexPages[tNum].mapped + i))[0]) & 0xFFFFFFFF) == 1000)){ if((ntohl((((long long int*)(indexPages[tNum].mapped + i))[0]) & 0xFFFFFFFF) == 1000)){
((long long int *)(indexPages[tNum].mapped + i))[0] &= 0xFFFFFFFF00000000; ((long long int *)(indexPages[tNum].mapped + i))[0] &= 0xFFFFFFFF00000000ull;
((long long int *)(indexPages[tNum].mapped + i))[0] |= htonl(inputLoc[tNum][curPage].keyNum); ((long long int *)(indexPages[tNum].mapped + i))[0] |= htonl(inputLoc[tNum][curPage].keyNum);
} }
} }

1
src/output/output_hss.cpp
View file

@ -3,7 +3,6 @@
#include <mist/mp4.h> #include <mist/mp4.h>
#include <mist/mp4_ms.h> #include <mist/mp4_ms.h>
#include <mist/mp4_generic.h> #include <mist/mp4_generic.h>
#include <mist/mp4_encryption.h>
#include <mist/base64.h> #include <mist/base64.h>
#include <mist/http_parser.h> #include <mist/http_parser.h>
#include <mist/stream.h> #include <mist/stream.h>