summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst/rtp/gstrtph264pay.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 17abfafd..21dfe2f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-05-07 Ole André Vadla Ravnås <ole.andre.ravnas at tandberg com>
+ * gst/rtp/gstrtph264pay.c (gst_rtp_h264_pay_parse_sps_pps):
+ Use GST_STR_NULL when trying to print sps and pps strings that could
+ be NULL, as this might crash on some platforms.
+
+2008-05-07 Ole André Vadla Ravnås <ole.andre.ravnas at tandberg com>
+
patch by: Haakon Sporsheim <haakon.sporsheim at tandberg com>
* sys/directdraw/gstdirectdrawsink.c (gst_directdraw_sink_setup_ddraw):
diff --git a/gst/rtp/gstrtph264pay.c b/gst/rtp/gstrtph264pay.c
index ce806d94..9938ed7b 100644
--- a/gst/rtp/gstrtph264pay.c
+++ b/gst/rtp/gstrtph264pay.c
@@ -512,7 +512,7 @@ gst_rtp_h264_pay_parse_sps_pps (GstBaseRTPPayload * basepayload,
"sprop-parameter-sets", G_TYPE_STRING, sprops, NULL);
GST_DEBUG ("outcaps udpate: profile=%s, sps=%s, pps=%s\n",
- profile, sps, pps);
+ profile, GST_STR_NULL (sps), GST_STR_NULL (pps));
g_free (sprops);
g_free (profile);