summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@nokia.com>2010-12-30 21:48:41 +0200
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2011-01-03 17:40:52 +0100
commit460785352c0739529b17aa4ebc6558c8eb086ca1 (patch)
tree55a3750b7fea6a3ed86ce731af43191250810006
parentcd690c2bc3193686535161fe36e920a13c733bb1 (diff)
qtmux: get rid of timestamp overprotectiveness
Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
-rw-r--r--gst/qtmux/gstqtmux.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c
index de067b743..29edc2a23 100644
--- a/gst/qtmux/gstqtmux.c
+++ b/gst/qtmux/gstqtmux.c
@@ -1993,13 +1993,7 @@ gst_qt_mux_add_buffer (GstQTMux * qtmux, GstQTPad * pad, GstBuffer * buf)
if (G_LIKELY (buf) && !pad->is_out_of_order) {
if (G_LIKELY (GST_BUFFER_TIMESTAMP_IS_VALID (last_buf) &&
GST_BUFFER_TIMESTAMP_IS_VALID (buf))) {
- if ((GST_BUFFER_TIMESTAMP (buf) < GST_BUFFER_TIMESTAMP (last_buf)) ||
- (!GST_CLOCK_TIME_IS_VALID (pad->first_ts) &&
- GST_BUFFER_DURATION_IS_VALID (last_buf) &&
- gst_qtmux_check_difference (qtmux,
- GST_BUFFER_TIMESTAMP (last_buf) +
- GST_BUFFER_DURATION (last_buf), GST_BUFFER_TIMESTAMP (buf),
- GST_BUFFER_DURATION (last_buf)))) {
+ if ((GST_BUFFER_TIMESTAMP (buf) < GST_BUFFER_TIMESTAMP (last_buf))) {
GST_DEBUG_OBJECT (qtmux, "detected out-of-order input");
pad->is_out_of_order = TRUE;
}