# HG changeset patch
# User greg
# Date 1508330952 14400
# Node ID 03581ee71fb9aa47d305acf5782363a2323617aa
# Parent  ee77c85ef867af85c1414b8e295fa6fa003f7434
Uploaded

diff -r ee77c85ef867 -r 03581ee71fb9 ffmpeg.xml
--- a/ffmpeg.xml	Wed Oct 18 08:07:37 2017 -0400
+++ b/ffmpeg.xml	Wed Oct 18 08:49:12 2017 -0400
@@ -16,16 +16,23 @@
                 <option value="images">images to video</option>
             </param>
             <when value="video">
-                <param name="input" type="data" format="avi,mpg" label="Select input video"/>
+                <param name="input" type="data" format="avi,mpg,mp4" label="Select input video"/>
                 <param name="sbf" type="integer" value="1" label="Number of seconds between frames"/>
             </when>
         </conditional>
+        <param name="output_process_log" type="select" display="radio" label="Output process log?">
+            <option value="no" selected="true">No</option>
+            <option value="yes">Yes</option>
+        </param>
     </inputs>
     <outputs>
-        <collection name="output_from_video" type="list">
+        <collection name="output_from_video" type="list" label="${tool.name} (images) on ${on_string}">
             <discover_datasets pattern="__name__" directory="output" format="jpg"/>
             <filter>conversion_cond['conversion'] == 'video'</filter>
         </collection>
+        <data name="output_log" format="txt" label="${tool.name} (process log) on ${on_string}">
+            <filter>output_process_log == 'yes'</filter>
+        </data>
     </outputs>
     <tests>
         <test>