X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=organize_videos.conf;fp=organize_videos.conf;h=fd1241345f1b2e5b670d013b7719999bcd6ec50c;hb=2675e038e4a9ef7bf5cee7ff32a77a6f31799965;hp=ccc46e2ceaa1bcb450af654f75070c68ba8d2ce2;hpb=26e29c4b2a1ba5181b379a64c86f4d521d77dcf7;p=videoscripts%2F.git

diff --git a/organize_videos.conf b/organize_videos.conf
index ccc46e2..fd12413 100644
--- a/organize_videos.conf
+++ b/organize_videos.conf
@@ -30,7 +30,7 @@ $watchpathname = "/naspool/cloud/alan/files/InstantUpload/Camera;/naspool/cloud/
 $merge_videos_by_day = "/naspool/videos/bin/merge_videos_by_day";
 
 # Flag to merge videos by modification date instead of the date parsed from the filename
-$merge_by_modification_date = 0;
+$merge_by_modification_date = 1;
 
 # Path to the make_mkv script
 $make_mkv = "/naspool/videos/bin/make_mkv";
@@ -76,7 +76,7 @@ $no_recompress_file_ext = qr/\.(mp4)$/i;
 
 # Video file creation dates must not have changed in the last X minutes to process any of the video files
 # This is done to ensure that all videos from a given upload from a camera have completed prior to looking for videos to merge
-$minage = "+60";
+$minage = "+120";
 
 # What command should be used to find files that have changed (are at least $minage old) 
 $find_changed_cmd = "find  \"$srcpathname/\" -not -cmin $minage -a \\( $movie_file_ext \\)";