summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-12-08 12:36:21 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-12-08 12:36:21 +0000
commit90adf4b958e1116272ef96f40f648add46123fc6 (patch)
treeb851c63b8cff1186c04c3506906c94c1c6d70af9
parent2020290c48846b1c53d770477902acc30da2eeb4 (diff)
gst/rtp/gstrtpmp4vpay.c: Don't try to push packets before we could find a valid config startcode. Fixes #563509.
Original commit message from CVS: * gst/rtp/gstrtpmp4vpay.c: (gst_rtp_mp4v_pay_flush), (gst_rtp_mp4v_pay_event): Don't try to push packets before we could find a valid config startcode. Fixes #563509.
-rw-r--r--ChangeLog7
-rw-r--r--gst/rtp/gstrtpmp4vpay.c6
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f680fce..682d5ef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-08 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/rtp/gstrtpmp4vpay.c: (gst_rtp_mp4v_pay_flush),
+ (gst_rtp_mp4v_pay_event):
+ Don't try to push packets before we could find a valid config
+ startcode. Fixes #563509.
+
2008-12-07 Sebastian Dröge <sebastian.droege@collabora.co.uk>
Patch by: Brian Cameron <brian.cameron at sun dot com>
diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c
index 01e7f2a0..afff75d5 100644
--- a/gst/rtp/gstrtpmp4vpay.c
+++ b/gst/rtp/gstrtpmp4vpay.c
@@ -283,6 +283,12 @@ gst_rtp_mp4v_pay_flush (GstRtpMP4VPay * rtpmp4vpay)
* over multiple packets. */
avail = gst_adapter_available (rtpmp4vpay->adapter);
+ if (rtpmp4vpay->config == NULL) {
+ /* when we don't have a config yet, flush things out */
+ gst_adapter_flush (rtpmp4vpay->adapter, avail);
+ avail = 0;
+ }
+
ret = GST_FLOW_OK;
while (avail > 0) {