CLI: remove 'L' from short opts so that getopt_long properly flags it as an invalid...

[handbrake-jp/handbrake-jp-git.git] / libhb / decmetadata.c

diff --git a/libhb/decmetadata.c b/libhb/decmetadata.c
index 754eb7a..bd848a9 100644 (file)
--- a/libhb/decmetadata.c
+++ b/libhb/decmetadata.c
@@ -13,7 +13,7 @@ static void decmp4metadata( hb_title_t *title )
     MP4FileHandle input_file;
     hb_deep_log( 2, "Got an MP4 input, read the metadata");
 
-    input_file = MP4Read( title->dvd, 0 );
+    input_file = MP4Read( title->path, 0 );
 
     if( input_file != MP4_INVALID_FILE_HANDLE )
     { 
@@ -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
@@ -84,7 +84,7 @@ static void decmp4metadata( hb_title_t *title )
                 chapter->minutes  = ( ( chapter->duration / 90000 ) % 3600 ) / 60;
                 chapter->seconds  = ( chapter->duration / 90000 ) % 60;
                 strcpy( chapter->title, chapter_list[i-1].title );
-                hb_deep_log( 2, "Added chapter %i, name='%s', dur=%lld, (%02i:%02i:%02i)", chapter->index, chapter->title, 
+                hb_deep_log( 2, "Added chapter %i, name='%s', dur=%"PRId64", (%02i:%02i:%02i)", chapter->index, chapter->title, 
                        chapter->duration, chapter->hours, 
                        chapter->minutes, chapter->seconds);
                 hb_list_add( title->list_chapter, chapter );