[MOVED FROM GST-P-FARSIGHT] Remove useless condition

20080429003412-4f0f6-9e890ad0ac442791a8b22650a75cb754d7f2d723.gz

diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c
index c2f236b..12a82cb 100644 (file)
--- a/gst/liveadder/liveadder.c
+++ b/gst/liveadder/liveadder.c
@@ -924,11 +924,7 @@ gst_live_live_adder_chain (GstPad *pad, GstBuffer *buffer)
     old_skip = GST_BUFFER_TIMESTAMP (buffer) + skip -
         GST_BUFFER_TIMESTAMP (oldbuffer);
 
-    if (GST_BUFFER_TIMESTAMP (buffer) + skip >
-        GST_BUFFER_TIMESTAMP (oldbuffer) + old_skip)
-      mix_start = GST_BUFFER_TIMESTAMP (buffer) + skip;
-    else
-      mix_start = GST_BUFFER_TIMESTAMP (oldbuffer) + old_skip;
+    mix_start = GST_BUFFER_TIMESTAMP (oldbuffer) + old_skip;
 
     if (GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer) <
         GST_BUFFER_TIMESTAMP (oldbuffer) + GST_BUFFER_DURATION (oldbuffer))