Merge branch 'development' into LTS_development
This commit is contained in:
commit
4a2fe53693
3 changed files with 4 additions and 2 deletions
|
@ -3021,6 +3021,7 @@ namespace MP4 {
|
|||
setFrameCount(1);
|
||||
setCompressorName("");
|
||||
setDepth(0x0018);
|
||||
setInt16(0xFFFF, 76);//must be -1
|
||||
}
|
||||
|
||||
void VisualSampleEntry::setCodec(const char * newCodec) {
|
||||
|
|
|
@ -499,8 +499,8 @@ namespace Mist {
|
|||
}
|
||||
break;
|
||||
}
|
||||
if (byteEnd > size - 1) {
|
||||
byteEnd = size - 1;
|
||||
if (byteEnd > size) {
|
||||
byteEnd = size;
|
||||
}
|
||||
} else {
|
||||
byteEnd = size;
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
int main(int argc, char* argv[]){
|
||||
if (argc < 4) {
|
||||
std::cerr << "Usage: " << argv[0] << " <inputFile> <variableName> <outputFile>" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
std::ofstream tmp(argv[3]);
|
||||
//begin the first line
|
||||
|
|
Loading…
Add table
Reference in a new issue