From 1e74181967821a8637fcf1dc66b1f1b77990cea7 Mon Sep 17 00:00:00 2001
From: yorch <yorch@yorchnet.com>
Date: Thu, 27 Oct 2016 12:10:33 -0700
Subject: [PATCH] Added scene change detection options for keyframing in the
 h264 converter scripts

---
 bash/make_h264+.sh | 3 ++-
 bash/make_h264.sh  | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bash/make_h264+.sh b/bash/make_h264+.sh
index bb29bef..84c8e75 100755
--- a/bash/make_h264+.sh
+++ b/bash/make_h264+.sh
@@ -1,4 +1,5 @@
+g=6;
 for i;
-	do ffmpeg -i "$i" -c:v libx264 -profile:v main -pix_fmt yuv420p -q 0 -strict -2 "${i%.*}_h264.mov" ;
+	do ffmpeg -i "$i" -c:v libx264 -x264opts keyint=$g:scenecut=-1 -profile:v main -pix_fmt yuv420p -q 0 -strict -2 "${i%.*}_h264.mov" ;
 done;
 	
diff --git a/bash/make_h264.sh b/bash/make_h264.sh
index 819da02..a40c8e6 100755
--- a/bash/make_h264.sh
+++ b/bash/make_h264.sh
@@ -1,8 +1,5 @@
+g=6;
 for i;
-<<<<<<< HEAD
-	do ffmpeg -i "$i" -c:v libx264 -profile:v main -pix_fmt yuv420p -q 0 -strict -2 -vb 5000k "${i%.*}_h264.mov" ;
-=======
-	do ffmpeg -i "$i" -c:v libx264 -profile:v main -pix_fmt yuv420p -q 0 -strict -2 "${i%.*}_h264.mov" ;
->>>>>>> a4f1bdc7ca935a4d555d2c313b1317af6b687756
+	do ffmpeg -i "$i" -c:v libx264 -x264opts keyint=$g:scenecut=-1 -profile:v main -pix_fmt yuv420p -q 0 -strict -2 -vb 5000k "${i%.*}_h264.mov" ;
 done;