Mercurial > repos > greg > ffmpeg

changeset 20:c1705fd38212 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Wed, 18 Oct 2017 14:04:23 -0400
parents e18b095d1c2c
children b99f8116ad62
files ffmpeg.xml
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ffmpeg.xml	Wed Oct 18 13:55:15 2017 -0400
+++ b/ffmpeg.xml	Wed Oct 18 14:04:23 2017 -0400
@@ -19,17 +19,11 @@
         #set full_name = $i.name
         #set ext = $i.ext
         ln -s $input_filename input_dir/$full_name &&
-        #if str($ext) != 'jpg':
-            #set base_name = $full_name.split('.')[0]
-            #set jpg_name = '%s.jpg' % $base_name
-            ffmpeg -i input_dir/$full_name input_dir/$jpg_name &&
-            rm input_dir/$full_name &&
-        #end if
     #end for
     #if str($output_process_log) == 'yes':
-        ffmpeg -r $conversion_cond.frame_rate -f mp4 -s 1920x1080 -i input_dir/%05d_predictions.jpg -vcodec libx264 -crf $conversion_cond.quality -pix_fmt yuv420p 2>$output_log $output_video
+        ffmpeg -r $conversion_cond.frame_rate -f mp4 -s 1920x1080 -i input_dir/%05d_predictions.$ext -vcodec libx264 -crf $conversion_cond.quality -pix_fmt yuv420p $output_video
     #else:
-        ffmpeg -r $conversion_cond.frame_rate -f mp4 -s 1920x1080 -i input_dir/%05d_predictions.jpg -vcodec libx264 -crf $conversion_cond.quality -pix_fmt yuv420p 2>/dev/null $output_video
+        ffmpeg -r $conversion_cond.frame_rate -f mp4 -s 1920x1080 -i input_dir/%05d_predictions.$ext -vcodec libx264 -crf $conversion_cond.quality -pix_fmt yuv420p $output_video
     #end if
 #end if
     ]]></command>