diff options
| -rw-r--r-- | contrib/mp4v2/module.defs | 2 | ||||
| -rw-r--r-- | libhb/decmetadata.c | 14 | ||||
| -rw-r--r-- | libhb/ipodutil.cpp | 34 |
3 files changed, 8 insertions, 42 deletions
diff --git a/contrib/mp4v2/module.defs b/contrib/mp4v2/module.defs index cf1f7058d..aa5219508 100644 --- a/contrib/mp4v2/module.defs +++ b/contrib/mp4v2/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,MP4V2,mp4v2)) $(eval $(call import.CONTRIB.defs,MP4V2)) -MP4V2.FETCH.url = http://download.m0k.org/handbrake/contrib/mp4v2-trunk-r349.tar.bz2 +MP4V2.FETCH.url = http://download.m0k.org/handbrake/contrib/mp4v2-trunk-r355.tar.bz2 ## propagate more flags MP4V2.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,MP4V2.GCC,*archs *D .g .O)" diff --git a/libhb/decmetadata.c b/libhb/decmetadata.c index 754eb7a25..df0c5b3ef 100644 --- a/libhb/decmetadata.c +++ b/libhb/decmetadata.c @@ -28,26 +28,26 @@ static void decmp4metadata( hb_title_t *title ) if( tags->name ) { hb_deep_log( 2, "Metadata Name in input file is '%s'", tags->name ); - strncpy( title->metadata->name, tags->name, 255 ); + strncpy( title->metadata->name, tags->name, sizeof(title->metadata->name) ); } if( tags->artist ) - strncpy( title->metadata->artist, tags->artist, 255 ); + strncpy( title->metadata->artist, tags->artist, sizeof(title->metadata->artist) ); if( tags->composer ) - strncpy( title->metadata->composer, tags->composer, 255 ); + strncpy( title->metadata->composer, tags->composer, sizeof(title->metadata->composer) ); if( tags->comments ) - strncpy( title->metadata->comment, tags->comments, 1024 ); + strncpy( title->metadata->comment, tags->comments, sizeof(title->metadata->comment) ); if( tags->releaseDate ) - strncpy( title->metadata->release_date, tags->releaseDate, 255 ); + strncpy( title->metadata->release_date, tags->releaseDate, sizeof(title->metadata->release_date) ); if( tags->album ) - strncpy( title->metadata->album, tags->album, 255 ); + strncpy( title->metadata->album, tags->album, sizeof(title->metadata->album) ); if( tags->genre ) - strncpy( title->metadata->genre, tags->genre, 255 ); + strncpy( title->metadata->genre, tags->genre, sizeof(title->metadata->genre) ); if( tags->artworkCount > 0 ) { const MP4TagArtwork* art = tags->artwork + 0; // first element diff --git a/libhb/ipodutil.cpp b/libhb/ipodutil.cpp deleted file mode 100644 index ba37e4768..000000000 --- a/libhb/ipodutil.cpp +++ /dev/null @@ -1,34 +0,0 @@ -/* - * MP4 library API functions - * - * These are wrapper functions that provide C linkage conventions - * to the library, and catch any internal errors, ensuring that - * a proper return value is given. - */ - -#include "mp4common.h" - -static u_int8_t ipod_magic[] = { - 0x6b, 0x68, 0x40, 0xf2, 0x5f, 0x24, 0x4f, 0xc5, - 0xba, 0x39, 0xa5, 0x1b, 0xcf, 0x03, 0x23, 0xf3 -}; - -class IPodUUIDAtom : public MP4Atom { -public: - IPodUUIDAtom() : MP4Atom("uuid") - { - SetExtendedType(ipod_magic); - - MP4Integer32Property* value = new MP4Integer32Property("value"); - value->SetValue(1); - AddProperty(value); - } -}; - -extern "C" void AddIPodUUID(MP4FileHandle hFile, MP4TrackId trackId) -{ - MP4Track* track = ((MP4File*)hFile)->GetTrack(trackId); - MP4Atom* avc1 = track->GetTrakAtom()->FindChildAtom("mdia.minf.stbl.stsd.avc1"); - avc1->AddChildAtom(new IPodUUIDAtom()); -} - |