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

oeps.

Browse source
This commit is contained in:
Thulinma 2011-03-21 00:44:44 +01:00
parent 4d0689eff7
commit 10ab707e8a
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
util/MP4/box.cpp
View file

@ -46,8 +46,6 @@ class Box {
uint8_t * Payload; uint8_t * Payload;
BoxHeader header; BoxHeader header;
uint32_t PayloadSize; uint32_t PayloadSize;
private:
BoxHeader header;
};//Box Class };//Box Class
Box::Box() { Box::Box() {
@ -177,7 +175,6 @@ void Box::ResetPayload( ) {
Payload = NULL; Payload = NULL;
} }
} }
<<<<<<< HEAD
void Box::Parse( std::string PrintOffset ) { void Box::Parse( std::string PrintOffset ) {
if( header.BoxType == 0x61627374 ) { if( header.BoxType == 0x61627374 ) {
@ -399,5 +396,4 @@ void Box::Parse( std::string PrintOffset ) {
<< "' not yet implemented!\n"; << "' not yet implemented!\n";
} }
} }
=======
>>>>>>> 7520f5799f3da3c1a89a28fd4d62358b0028d8d2