X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=mkv2mp4;h=2d9d873560b4d83701e6d14ae7cc9351e7c0ea26;hb=c91b8b9feda0a1fc3221cffd3e28cee33e919b5a;hp=afbd0a8adb25b95a4f9c410395667421900e5f8d;hpb=9580365135dbaa7c89e0e30f097c566e9a3a6650;p=videoscripts%2F.git

diff --git a/mkv2mp4 b/mkv2mp4
index afbd0a8..2d9d873 100755
--- a/mkv2mp4
+++ b/mkv2mp4
@@ -1,8 +1,14 @@
 #!/bin/bash
 
 INPUT=$1
-FILENAME=${INPUT%%.*}
-OUTPUT="$FILENAME.mp4"
+OUTPUT_DIR=$2
+
+if [ -z "$OUTPUT_DIR" ]; then
+    OUTPUT_DIR="."
+fi
+
+FILENAME=`basename ${INPUT%%.*}`
+OUTPUT="$OUTPUT_DIR/$FILENAME.mp4"
 
 echo "-> Converting $INPUT to $OUTPUT file"
 
@@ -11,6 +17,9 @@ if [[ -e "$OUTPUT" ]]; then
   exit 1
 fi
 
+# 720p
+# HandBrakeCLI -d -b 3000 -q 0.8 -w 1280 -i /naspool/videos/HomeVideos/2011/2011-12-01.000.mkv -o 2011-12-01.mp4
+
 ffmpeg -i $INPUT \
   -b:v 3000k \
   -vcodec libx264 \