From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 2 Aug 2013 04:28:32 +0000 (+0200)
Subject: jitterbuffer: small cleanup
X-Git-Tag: 1.19.3~509^2~5493
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6b6797874d857cf8ab6b2fe9429ab0ff4533856;p=platform%2Fupstream%2Fgstreamer.git

jitterbuffer: small cleanup
---

diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c
index f8d85c4..57a989e 100644
--- a/gst/rtpmanager/gstrtpjitterbuffer.c
+++ b/gst/rtpmanager/gstrtpjitterbuffer.c
@@ -1400,9 +1400,6 @@ remove_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer)
   GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;
   guint idx;
 
-  if (timer == NULL)
-    return;
-
   if (priv->clock_id && priv->timer_seqnum == timer->seqnum)
     unschedule_current_timer (jitterbuffer);
 
@@ -1475,7 +1472,9 @@ update_timers (GstRtpJitterBuffer * jitterbuffer, guint16 seqnum,
     else
       timer = add_timer (jitterbuffer, TIMER_TYPE_EXPECTED,
           priv->next_in_seqnum, expected);
-  } else {
+  } else if (timer) {
+    /* if we had a timer, remove it, we don't know when to expect the next
+     * packet. */
     remove_timer (jitterbuffer, timer);
   }
 }