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

Conflic fixage

Browse source
This commit is contained in:
Thulinma 2011-03-21 00:42:10 +01:00
commit 5e507a076e
7 changed files with 269 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/MP4/box.cpp
View file

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