# HG changeset patch
# User greg
# Date 1508328457 14400
# Node ID ee77c85ef867af85c1414b8e295fa6fa003f7434
# Parent  9c1d2cbf6661ae98ddfdb7898579d5f4f96468c8
Uploaded

diff -r 9c1d2cbf6661 -r ee77c85ef867 ffmpeg.xml
--- a/ffmpeg.xml	Tue Oct 17 14:24:36 2017 -0400
+++ b/ffmpeg.xml	Wed Oct 18 08:07:37 2017 -0400
@@ -6,7 +6,7 @@
     <command detect_errors="exit_code"><![CDATA[
 #if str($conversion_cond.conversion) == "video":
     mkdir output &&
-    ffmpeg -i '$input' -filter:v fps=fps=1/$sbf 2>/dev/null output/%05d.$ext
+    ffmpeg -i '$conversion_cond.input' -filter:v fps=fps=1/$conversion_cond.sbf 2>/dev/null output/%05d.jpg
 #end if
     ]]></command>
     <inputs>
@@ -18,11 +18,6 @@
             <when value="video">
                 <param name="input" type="data" format="avi,mpg" label="Select input video"/>
                 <param name="sbf" type="integer" value="1" label="Number of seconds between frames"/>
-                <param name="ext" type="select" label="Image format">
-                    <option value="jpg" selected="true">Jpg</option>
-                    <option value="png">Png</option>
-                    <option value="bmp">bmp</option>
-                </param>
             </when>
         </conditional>
     </inputs>
@@ -30,10 +25,6 @@
         <collection name="output_from_video" type="list">
             <discover_datasets pattern="__name__" directory="output" format="jpg"/>
             <filter>conversion_cond['conversion'] == 'video'</filter>
-            <change_format>
-                <when input="conversion_cond.ext" value="png" format="png"/>
-                <when input="conversion_cond.ext" value="bmp" format="bmp"/>
-            </change_format>
         </collection>
     </outputs>
     <tests>