summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sf.net>2008-03-11 10:43:32 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-03-11 10:43:32 +0000
commit4e64ace7122a861cbc8d36f1960f241ead49a0e5 (patch)
treee7022d7d9add978aebffa3d9ed237ecd04ca79b9
parente92772a7e9561a39775229d79fcded9845b26ea8 (diff)
downloadgst-plugins-bad-4e64ace7122a861cbc8d36f1960f241ead49a0e5.tar.gz
gst-plugins-bad-4e64ace7122a861cbc8d36f1960f241ead49a0e5.tar.bz2
gst-plugins-bad-4e64ace7122a861cbc8d36f1960f241ead49a0e5.zip
gst/rtpmanager/rtpjitterbuffer.c: Don't try to reset the clock skew when we have no timestamps.
Original commit message from CVS: Patch by: Stefan Kost <ensonic@users.sf.net> * gst/rtpmanager/rtpjitterbuffer.c: (calculate_skew): Don't try to reset the clock skew when we have no timestamps. Fixes #519005.
-rw-r--r--ChangeLog8
-rw-r--r--gst/rtpmanager/rtpjitterbuffer.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 72a6538b..a5ae9fda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-11 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ Patch by: Stefan Kost <ensonic@users.sf.net>
+
+ * gst/rtpmanager/rtpjitterbuffer.c: (calculate_skew):
+ Don't try to reset the clock skew when we have no timestamps.
+ Fixes #519005.
+
2008-03-08 Sebastian Dröge <slomo@circular-chaos.org>
Patch by: Sjoerd Simons <sjoerd at luon dot net>
diff --git a/gst/rtpmanager/rtpjitterbuffer.c b/gst/rtpmanager/rtpjitterbuffer.c
index a2c08fb0..8aaefeb0 100644
--- a/gst/rtpmanager/rtpjitterbuffer.c
+++ b/gst/rtpmanager/rtpjitterbuffer.c
@@ -208,7 +208,7 @@ again:
GST_TIME_ARGS (gstrtptime), GST_TIME_ARGS (jbuf->base_rtptime),
GST_TIME_ARGS (send_diff));
- if (jbuf->prev_send_diff != -1) {
+ if (jbuf->prev_send_diff != -1 && time != -1) {
gint64 delta_diff;
if (send_diff > jbuf->prev_send_diff)