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

Fixed broken build. Bad Erik! ^_^

Browse source
This commit is contained in:
Thulinma 2013-08-26 11:21:43 +02:00
parent f17406edd6
commit 203a4382a7
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/mp4.cpp
View file

@ -4191,7 +4191,7 @@ namespace MP4 {
setDepth(0x0018); setDepth(0x0018);
} }
void VisualSampleEntry::setCodec(char* newCodec){ void VisualSampleEntry::setCodec(const char* newCodec){
memcpy(data + 4, newCodec, 4); memcpy(data + 4, newCodec, 4);
} }
@ -4304,7 +4304,7 @@ namespace MP4 {
setSampleRate(44100); setSampleRate(44100);
} }
void AudioSampleEntry::setCodec(char* newCodec){ void AudioSampleEntry::setCodec(const char* newCodec){
memcpy(data + 4, newCodec, 4); memcpy(data + 4, newCodec, 4);
} }

4
lib/mp4.h
View file

@ -819,7 +819,7 @@ namespace MP4 {
///\todo set default values ///\todo set default values
public: public:
VisualSampleEntry(); VisualSampleEntry();
void setCodec(char* newCodec); void setCodec(const char* newCodec);
void setWidth(uint16_t newWidth); void setWidth(uint16_t newWidth);
uint16_t getWidth(); uint16_t getWidth();
void setHeight(uint16_t newHeight); void setHeight(uint16_t newHeight);
@ -844,7 +844,7 @@ namespace MP4 {
public: public:
///\todo set default values ///\todo set default values
AudioSampleEntry(); AudioSampleEntry();
void setCodec(char* newCodec); void setCodec(const char* newCodec);
void setChannelCount(uint16_t newChannelCount); void setChannelCount(uint16_t newChannelCount);
uint16_t getChannelCount(); uint16_t getChannelCount();
void setSampleSize(uint16_t newSampleSize); void setSampleSize(uint16_t newSampleSize);

2
lib/mp4_conv.cpp
View file

@ -48,7 +48,7 @@ namespace MP4{
//putting all metadata in a huge vector 'keyParts' //putting all metadata in a huge vector 'keyParts'
keyParts.clear(); keyParts.clear();
for (JSON::ObjIter trackIt = metaData["tracks"].ObjBegin(); trackIt != metaData["tracks"].ObjEnd(); trackIt++){ for (JSON::ObjIter trackIt = metaData["tracks"].ObjBegin(); trackIt != metaData["tracks"].ObjEnd(); trackIt++){
for (JSON::ObjArrIter keyIt = trackIt->second["keys"].ArrBegin(); keyIt != trackIt->second["keys"].ArrEnd(); keyIt++){ for (JSON::ArrIter keyIt = trackIt->second["keys"].ArrBegin(); keyIt != trackIt->second["keys"].ArrEnd(); keyIt++){
keyPart temp; keyPart temp;
temp.trackID = trackIt->second["trackid"].asInt(); temp.trackID = trackIt->second["trackid"].asInt();
temp.size = (*keyIt)["size"].asInt(); temp.size = (*keyIt)["size"].asInt();