Finally recommitting clee's patch from r518 to allow 64-bit mp4 files that can hold more than 4 gigs... controlled by a boolean called job->largeFileSize and enabled from the cli with -4 or --large-file. Note that this breaks compatibility with stuff like the iPod, AppleTV, PS3 (I think), etc...so it is off by default.

Also converted a few stray hard tabs into soft tabs.

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

1 files changed, 12 insertions, 1 deletions

diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c
index cfaf11ebb..c70e2c114 100644
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
@@ -143,7 +143,18 @@ static int MP4Init( hb_mux_object_t * m )
     
 
     /* Create an empty mp4 file */
-    m->file = MP4Create( job->file, MP4_DETAILS_ERROR, 0 );
+    if (job->largeFileSize)
+    /* Use 64-bit MP4 file */
+    {
+        m->file = MP4Create( job->file, MP4_DETAILS_ERROR, MP4_CREATE_64BIT_DATA ); 
+        hb_log("Using 64-bit MP4 formatting.");
+    }
+    else
+    /* Limit MP4s to less than 4 GB */
+    {
+        m->file = MP4Create( job->file, MP4_DETAILS_ERROR, 0 );
+    }
+    
     if (m->file == MP4_INVALID_FILE_HANDLE)
     {
         hb_log("muxmp4.c: MP4Create failed!");