Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2017-03-02 17:30:17 +01:00
commit 4a2fe53693
3 changed files with 4 additions and 2 deletions

View file

@ -3021,6 +3021,7 @@ namespace MP4 {
setFrameCount(1); setFrameCount(1);
setCompressorName(""); setCompressorName("");
setDepth(0x0018); setDepth(0x0018);
setInt16(0xFFFF, 76);//must be -1
} }
void VisualSampleEntry::setCodec(const char * newCodec) { void VisualSampleEntry::setCodec(const char * newCodec) {

View file

@ -499,8 +499,8 @@ namespace Mist {
} }
break; break;
} }
if (byteEnd > size - 1) { if (byteEnd > size) {
byteEnd = size - 1; byteEnd = size;
} }
} else { } else {
byteEnd = size; byteEnd = size;

View file

@ -7,6 +7,7 @@
int main(int argc, char* argv[]){ int main(int argc, char* argv[]){
if (argc < 4) { if (argc < 4) {
std::cerr << "Usage: " << argv[0] << " <inputFile> <variableName> <outputFile>" << std::endl; std::cerr << "Usage: " << argv[0] << " <inputFile> <variableName> <outputFile>" << std::endl;
return 1;
} }
std::ofstream tmp(argv[3]); std::ofstream tmp(argv[3]);
//begin the first line //begin the first line