[Debconf-video-commits] r341 - package/trunk/src

[benh at alioth.debian.org]

Author: benh
Date: 2009-03-20 03:58:25 +0000 (Fri, 20 Mar 2009)
New Revision: 341

Modified:
   package/trunk/src/dc-do-transcoding
Log:
Use either -f or -target option to set output format, as appropriate.


Modified: package/trunk/src/dc-do-transcoding
===================================================================
--- package/trunk/src/dc-do-transcoding	2009-03-20 03:55:49 UTC (rev 340)
+++ package/trunk/src/dc-do-transcoding	2009-03-20 03:58:25 UTC (rev 341)
@@ -141,10 +141,10 @@
             argv.extend(['-ss', str(start_time)])
         if end_time:
             argv.extend(['-t', str(end_time - (start_time or 0))])
-        # XXX The schema says that container_name is a
-        # format name but we actually use it as a target
-        # name here.
-        argv.extend(['-target', job.container_name])
+        if re.match(r'(?:pal|ntsc|film)-', job.container_name):
+            argv.extend(['-target', job.container_name])
+        else:
+            argv.extend(['-f', job.container_name])
         # video parameters
         argv.extend(['-deinterlace'])
         if job.video_width and job.video_height: