X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=1546f8aa7994a270df976e711ae805336cd85d53;hb=86d3c7b5e79cef08b254192ae674b9d8324094a2;hp=686fff918748b851e7c0b21377550dcc2c7391b1;hpb=79f431e19ea88f28e23d5bd4b9f39a7e6d0b1471;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 686fff9..1546f8a 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -136,7 +136,7 @@ function get_frame_name()
     local index
 
     index=$(printf "${F_FMT}" ${1})
-    echo "${dest}/${group}-f${index}.png"
+    echo "${dest}/${dest}-${group}-f${index}.png"
 }
 
 # Arg1: start frame
@@ -166,15 +166,20 @@ function generate_video()
 
     if which ffmpeg 1> /dev/null 2>&1; then
         set +e
-        png_files=$(ls ${dest}/${group}-f*.png 2> /dev/null)
+        png_files=$(ls ${dest}/${dest}-${group}-f*.png 2> /dev/null)
         set -e
 
         if [ x"${png_files}" != x"" ]; then
             log_dbg "generate_video start"
+
+            local outfile
+
+            outfile=${dest}/${dest}-${group}.mp4
+
             if [ ${dry_run} -eq 1 ]; then
-                touch ${dest}/${group}.mp4
+                touch ${outfile}
             else
-                ffmpeg ${FFMPEG_OPTS} -r ${fps} -pattern_type glob -i "${dest}/${group}-f*.png" ${dest}/${group}.mp4
+                ffmpeg ${FFMPEG_OPTS} -r ${fps} -pattern_type glob -i "${dest}/${dest}-${group}-f*.png" ${outfile}
             fi
 
             log_dbg "generate_video: end"