summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2009-07-28 18:18:20 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2009-07-28 18:18:20 +0200
commit9232e2278c229a0d238c4a22b0169b3024cb7914 (patch)
tree1edf9b4f429a8f3974b19f17f30f21e963610295
parent03348629cea29e878c9acd2f5aa344fa71b009b0 (diff)
downloadgst-plugins-bad-9232e2278c229a0d238c4a22b0169b3024cb7914.tar.gz
gst-plugins-bad-9232e2278c229a0d238c4a22b0169b3024cb7914.tar.bz2
gst-plugins-bad-9232e2278c229a0d238c4a22b0169b3024cb7914.zip
rtpsource: allow for NULL caps on buffers
Add the NULL caps check where it matters and also cover another case of potential NULL caps. Fixes #590030
-rw-r--r--gst/rtpmanager/rtpsource.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/gst/rtpmanager/rtpsource.c b/gst/rtpmanager/rtpsource.c
index 77d56c22..1e0b6c0d 100644
--- a/gst/rtpmanager/rtpsource.c
+++ b/gst/rtpmanager/rtpsource.c
@@ -628,7 +628,7 @@ rtp_source_update_caps (RTPSource * src, GstCaps * caps)
gint ival;
/* nothing changed, return */
- if (src->caps == caps)
+ if (caps == NULL || src->caps == caps)
return;
s = gst_caps_get_structure (caps, 0);
@@ -981,8 +981,7 @@ rtp_source_process_rtp (RTPSource * src, GstBuffer * buffer,
seqnr = gst_rtp_buffer_get_seq (buffer);
- if (GST_BUFFER_CAPS (buffer))
- rtp_source_update_caps (src, GST_BUFFER_CAPS (buffer));
+ rtp_source_update_caps (src, GST_BUFFER_CAPS (buffer));
if (stats->cycles == -1) {
GST_DEBUG ("received first buffer");