[Debconf-video-commits] r116 - in package/trunk: debian src

[benh at alioth.debian.org]

Author: benh
Date: 2008-08-03 11:53:52 +0000 (Sun, 03 Aug 2008)
New Revision: 116

Modified:
   package/trunk/debian/changelog
   package/trunk/src/dc-do-transcoding
Log:
Changed -ab and -timestamp arguments to be compatible with current ffmpeg


Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2008-08-01 03:19:33 UTC (rev 115)
+++ package/trunk/debian/changelog	2008-08-03 11:53:52 UTC (rev 116)
@@ -14,6 +14,8 @@
     - Changed messages to be shorter and hopefully more readable
     - Fixed ordering of arguments to ffmpeg
     - Removed aspect override
+    - Changed -ab and -timestamp arguments to be compatible with current
+      ffmpeg
   * Added dc-do-transcoding to debconf-video-store package
   * Changes in dc-import-recordings:
     - Made deletion of database records for missing DV files optional
@@ -30,7 +32,7 @@
   [Ulises Vitulli]
   * Updated network setup in diagram
 
- --
+ -- 
 
 debconf-video (7.0) unstable; urgency=low
 

Modified: package/trunk/src/dc-do-transcoding
===================================================================
--- package/trunk/src/dc-do-transcoding	2008-08-01 03:19:33 UTC (rev 115)
+++ package/trunk/src/dc-do-transcoding	2008-08-03 11:53:52 UTC (rev 116)
@@ -157,10 +157,12 @@
         if job.audio_channel_count:
             argv.extend(['-ac', str(job.audio_channel_count)])
         argv.extend(['-acodec', job.audio_codec_name,
-                     '-ab', str(job.audio_bit_rate // 1000)])
+                     # Some versions except bit/s here; others kbit/s.
+                     # An explicit 'k' on the end seems to work for all.
+                     '-ab', '%dk' % (job.audio_bit_rate // 1000)])
         # metadata
         argv.extend(['-author', author,
-                     '-timestamp', str(job.recording_time)[:10], # ugh
+                     '-timestamp', str(job.recording_time),
                      '-copyright', author + '; ' + licence])
         # output filename must come after all the output options
         argv.extend(['-y', job.target_filename])