diff options
| author | Youness Alaoui <youness.alaoui@collabora.co.uk> | 2008-04-29 00:34:12 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2009-02-17 19:29:05 +0100 |
| commit | 7a4034db44c4d728f42c6f01769e6841d6bc6270 (patch) | |
| tree | ebf01db174d9c600af70d8056255d11957a1bd5d /gst | |
| parent | cd3f191dab28decadad13fea65f6a585011ff4ba (diff) | |
| download | gst-plugins-bad-7a4034db44c4d728f42c6f01769e6841d6bc6270.tar.gz gst-plugins-bad-7a4034db44c4d728f42c6f01769e6841d6bc6270.tar.bz2 gst-plugins-bad-7a4034db44c4d728f42c6f01769e6841d6bc6270.zip | |
[MOVED FROM GST-P-FARSIGHT] Remove useless condition
20080429003412-4f0f6-9e890ad0ac442791a8b22650a75cb754d7f2d723.gz
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/liveadder/liveadder.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c index c2f236b9..12a82cb4 100644 --- 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)) |