[SCM] morituri/master: The logic was the wrong way around.

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Oct 19 20:10:02 UTC 2014


The following commit has been merged in the master branch:
commit f05ec0f2e97f0fa09cc1556b3db5f9850926b8d8
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Feb 24 12:19:21 2013 +0100

    The logic was the wrong way around.
    
    The idea is that we set an interval that is definitely smaller than
    the whole file.

diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index dba0eb1..7b0ad8d 100644
--- a/morituri/common/encode.py
+++ b/morituri/common/encode.py
@@ -239,8 +239,8 @@ class EncodeTask(ctask.GstPipelineTask):
         # set an interval that is smaller than the duration
         # FIXME: check level and make sure it emits level up to the last
         # sample, even if input is small
-        interval = 1000000000L
-        if interval < duration:
+        interval = self.gst.SECOND
+        if interval > duration:
             interval = duration / 2
         self._level.set_property('interval', interval)
         # add a probe so we can track progress

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list