Skip to content

fixed issues with compiling for macOS #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bergert wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixed issues with compiling for macOS #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/atom_standard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ MP4StandardAtom::MP4StandardAtom (MP4File &file, const char *type) : MP4Atom(fil
ExpectChildAtom("soco", Optional, OnlyOne); /* sort composer */
ExpectChildAtom("sosn", Optional, OnlyOne); /* sort show */
ExpectChildAtom("hdvd", Optional, OnlyOne); /* HD video */
ExpectChildAtom("�enc", Optional, OnlyOne); /* Encoded by */
ExpectChildAtom("\251enc", Optional, OnlyOne); /* Encoded by */
ExpectChildAtom("pcst", Optional, OnlyOne); /* Podcast flag */
ExpectChildAtom("keyw", Optional, OnlyOne); /* Keywords (for podcasts?) */
ExpectChildAtom("catg", Optional, OnlyOne); /* Category (for podcasts?) */
Expand Down
6 changes: 3 additions & 3 deletions src/mp4track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId )
MP4FtypAtom *pFtypAtom = reinterpret_cast<MP4FtypAtom *>( m_File.FindAtom( "ftyp" ) );

// MOV spec does not require "ftyp" atom...
if ( pFtypAtom == nullptr )
if ( pFtypAtom == NULL )
{
return nullptr;
return NULL;
}
else
{
// ... but most often it is present with a "qt " value
const char *majorBrand = pFtypAtom->majorBrand.GetValue();
if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt " ) == 0 )
return nullptr;
return NULL;
}
throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ );
}
Expand Down