Bumps libmp4v2 to r21, which fixes that include issue by folding the old 5.5G iPod UUID atom into the library, as well as a typing issue with Linux systems.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1836 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 6 insertions, 12 deletions

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 4cd106779..2758ad65e 100644
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -268,8 +268,8 @@ actions LibMp4v2
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf libmp4v2 && (gzip -dc libmp4v2.tar.gz | tar xf - ) &&
-    cd mp4v2 && $(LIBMP4V2_PATCH) ./configure --prefix=$CONTRIB &&
-    $(MAKE) && make install && cp *.h $CONTRIB/include &&
+    cd libmp4v2 && $(LIBMP4V2_PATCH) ./configure --prefix=$CONTRIB &&
+    $(MAKE) && make install &&
     $(STRIP) $CONTRIB/lib/libmp4v2.a
 }
 Wget     $(SUBDIR)/libmp4v2.tar.gz : $(SUBDIR)/version_libmp4v2.txt ;
diff --git a/contrib/version_libmp4v2.txt b/contrib/version_libmp4v2.txt
index 96563ff21..a274f0c64 100644
--- a/contrib/version_libmp4v2.txt
+++ b/contrib/version_libmp4v2.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/libmp4v2-r19.tar.gz
+http://download.m0k.org/handbrake/contrib/libmp4v2-r21.tar.gz
diff --git a/libhb/Jamfile b/libhb/Jamfile
index 5352265b5..51158b9fd 100644
--- a/libhb/Jamfile
+++ b/libhb/Jamfile
@@ -7,7 +7,7 @@
 SubDir TOP libhb : hbversion.h ;
 
 LIBHB_SRC =
-ipodutil.cpp common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c update.c
+common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c update.c
 demuxmpeg.c fifo.c render.c reader.c muxcommon.c muxmp4.c sync.c stream.c
 decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c decavcodec.c encxvid.c
 muxavi.c enclame.c muxogm.c encvorbis.c dvd.c muxmkv.c deblock.c deinterlace.c 
diff --git a/libhb/Makefile b/libhb/Makefile
index fba6c5d59..858d5b1aa 100644
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -25,7 +25,7 @@ SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c enctheora.c \
 	   update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c stream.c \
 	   muxmp4.c sync.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c \
 	   decavcodec.c encxvid.c muxmkv.c muxavi.c enclame.c muxogm.c encvorbis.c \
-	   dvd.c  ipodutil.cpp deblock.c deinterlace.c denoise.c detelecine.c decomb.c lang.c
+	   dvd.c deblock.c deinterlace.c denoise.c detelecine.c decomb.c lang.c
 OTMP = $(SRCS:%.c=%.o) 
 OBJS = $(OTMP:%.cpp=%.o)
 
diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c
index 3740caca0..a6ddedf5d 100644
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
@@ -218,7 +218,7 @@ static int MP4Init( hb_mux_object_t * m )
 		if( job->h264_level == 30 || job->ipod_atom)
 		{
 			hb_deep_log( 2, "muxmp4: adding iPod atom");
-			AddIPodUUID(m->file, mux_data->track);
+			MP4AddIPodUUID(m->file, mux_data->track);
 		}
 
         m->init_delay = job->config.h264.init_delay;
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index aee36687d..f864f75a7 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -26,7 +26,6 @@
 		0DFA5CCA0B8DD3FE0020BC09 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C880B8DD3B60020BC09 /* encxvid.c */; };
 		0DFA5CCB0B8DD3FE0020BC09 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C890B8DD3B60020BC09 /* fifo.c */; };
 		0DFA5CCC0B8DD3FE0020BC09 /* hb.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8A0B8DD3B60020BC09 /* hb.c */; };
-		0DFA5CCD0B8DD3FE0020BC09 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */; };
 		0DFA5CCE0B8DD3FE0020BC09 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C910B8DD3B60020BC09 /* muxavi.c */; };
 		0DFA5CCF0B8DD3FE0020BC09 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */; };
 		0DFA5CD00B8DD3FE0020BC09 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */; };
@@ -51,7 +50,6 @@
 		0DFA5CE30B8DD4210020BC09 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C880B8DD3B60020BC09 /* encxvid.c */; };
 		0DFA5CE40B8DD4210020BC09 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C890B8DD3B60020BC09 /* fifo.c */; };
 		0DFA5CE50B8DD4210020BC09 /* hb.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8A0B8DD3B60020BC09 /* hb.c */; };
-		0DFA5CE60B8DD4210020BC09 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */; };
 		0DFA5CE70B8DD4210020BC09 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C910B8DD3B60020BC09 /* muxavi.c */; };
 		0DFA5CE80B8DD4210020BC09 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */; };
 		0DFA5CE90B8DD4210020BC09 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */; };
@@ -213,7 +211,6 @@
 		0DFA5C880B8DD3B60020BC09 /* encxvid.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encxvid.c; path = ../libhb/encxvid.c; sourceTree = SOURCE_ROOT; };
 		0DFA5C890B8DD3B60020BC09 /* fifo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fifo.c; path = ../libhb/fifo.c; sourceTree = SOURCE_ROOT; };
 		0DFA5C8A0B8DD3B60020BC09 /* hb.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hb.c; path = ../libhb/hb.c; sourceTree = SOURCE_ROOT; };
-		0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ipodutil.cpp; path = ../libhb/ipodutil.cpp; sourceTree = SOURCE_ROOT; };
 		0DFA5C910B8DD3B60020BC09 /* muxavi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxavi.c; path = ../libhb/muxavi.c; sourceTree = SOURCE_ROOT; };
 		0DFA5C920B8DD3B60020BC09 /* muxcommon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxcommon.c; path = ../libhb/muxcommon.c; sourceTree = SOURCE_ROOT; };
 		0DFA5C930B8DD3B60020BC09 /* muxmp4.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxmp4.c; path = ../libhb/muxmp4.c; sourceTree = SOURCE_ROOT; };
@@ -445,7 +442,6 @@
 				0DFA5C880B8DD3B60020BC09 /* encxvid.c */,
 				0DFA5C890B8DD3B60020BC09 /* fifo.c */,
 				0DFA5C8A0B8DD3B60020BC09 /* hb.c */,
-				0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */,
 				0DFA5C920B8DD3B60020BC09 /* muxcommon.c */,
 				A273E0950C57C19500493A45 /* muxmkv.c */,
 				0DFA5C930B8DD3B60020BC09 /* muxmp4.c */,
@@ -744,7 +740,6 @@
 				0DFA5CE30B8DD4210020BC09 /* encxvid.c in Sources */,
 				0DFA5CE40B8DD4210020BC09 /* fifo.c in Sources */,
 				0DFA5CE50B8DD4210020BC09 /* hb.c in Sources */,
-				0DFA5CE60B8DD4210020BC09 /* ipodutil.cpp in Sources */,
 				0DFA5CE70B8DD4210020BC09 /* muxavi.c in Sources */,
 				0DFA5CE80B8DD4210020BC09 /* muxcommon.c in Sources */,
 				0DFA5CE90B8DD4210020BC09 /* muxmp4.c in Sources */,
@@ -787,7 +782,6 @@
 				0DFA5CCA0B8DD3FE0020BC09 /* encxvid.c in Sources */,
 				0DFA5CCB0B8DD3FE0020BC09 /* fifo.c in Sources */,
 				0DFA5CCC0B8DD3FE0020BC09 /* hb.c in Sources */,
-				0DFA5CCD0B8DD3FE0020BC09 /* ipodutil.cpp in Sources */,
 				0DFA5CCE0B8DD3FE0020BC09 /* muxavi.c in Sources */,
 				0DFA5CCF0B8DD3FE0020BC09 /* muxcommon.c in Sources */,
 				0DFA5CD00B8DD3FE0020BC09 /* muxmp4.c in Sources */,