From 46139253bcb1ddc32fc8987c194c40d9c622e993 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 5 May 2009 16:48:37 +0200
Subject: [PATCH] rtpssrcdemux: drop unexpected RTCP packets

We usually only get SR packets in our chain function but if an invalid packet
contains the SR packet after the RR packet, we must not fail but simply ignore
the malformed packet.

Fixes #581375
---
 gst/rtpmanager/gstrtpssrcdemux.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gst/rtpmanager/gstrtpssrcdemux.c b/gst/rtpmanager/gstrtpssrcdemux.c
index 64394c45d4..b9a279c2fb 100644
--- a/gst/rtpmanager/gstrtpssrcdemux.c
+++ b/gst/rtpmanager/gstrtpssrcdemux.c
@@ -483,7 +483,7 @@ gst_rtp_ssrc_demux_rtcp_chain (GstPad * pad, GstBuffer * buf)
           NULL);
       break;
     default:
-      goto invalid_rtcp;
+      goto unexpected_rtcp;
   }
 
   GST_DEBUG_OBJECT (demux, "received RTCP of SSRC %08x", ssrc);
@@ -511,6 +511,12 @@ invalid_rtcp:
     gst_buffer_unref (buf);
     return GST_FLOW_ERROR;
   }
+unexpected_rtcp:
+  {
+    GST_DEBUG_OBJECT (demux, "dropping unexpected RTCP packet");
+    gst_buffer_unref (buf);
+    return GST_FLOW_OK;
+  }
 create_failed:
   {
     GST_ELEMENT_ERROR (demux, STREAM, DECODE, (NULL),