---
 gst/rtp/gstrtph264pay.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: gst-plugins-good0.10-0.10.22/gst/rtp/gstrtph264pay.c
===================================================================
--- gst-plugins-good0.10-0.10.22.orig/gst/rtp/gstrtph264pay.c
+++ gst-plugins-good0.10-0.10.22/gst/rtp/gstrtph264pay.c
@@ -658,7 +658,7 @@
 
       /* bigger than interval, queue SPS/PPS */
       if (GST_TIME_AS_SECONDS (diff) >= rtph264pay->spspps_interval) {
-        GST_DEBUG_OBJECT (rtph264pay, "time to send SPS/PPS");
+        GST_DEBUG_OBJECT (rtph264pay, "time to send SPS/PPS (timeout %d)", rtph264pay->spspps_interval);
         send_spspps = TRUE;
       }
     } else {
@@ -945,6 +945,9 @@
       GST_DEBUG_OBJECT (basepayload, "found next start at %u of size %u", next,
           nal_len);
 
+      /* look for sps/pps */
+      update = gst_rtp_h264_pay_decode_nal (rtph264pay, data, nal_len, timestamp) || update;
+
       if (rtph264pay->sprop_parameter_sets != NULL) {
         /* explicitly set profile and sprop, use those */
         if (rtph264pay->update_caps) {
@@ -959,12 +962,14 @@
               rtph264pay->sprop_parameter_sets);
         }
       } else {
+#if 0
         /* We know our stream is a valid H264 NAL packet,
          * go parse it for SPS/PPS to enrich the caps */
         /* order: make sure to check nal */
         update =
             gst_rtp_h264_pay_decode_nal (rtph264pay, data, nal_len, timestamp)
             || update;
+#endif
       }
       /* move to next NAL packet */
       data += nal_len;
