diff --git a/ChangeLog b/ChangeLog
index 0c013a6a43..8a894bd4bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-20  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* gst/matroska/matroska-mux.c:
+	Fix NULL pointer dereference of an unset codec_id in the recently 
+	added Dirac paths
+
 2008-11-20  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* tests/check/Makefile.am:
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 866157febc..97c4333ceb 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -2099,7 +2099,8 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad)
   }
 
   /* for dirac we have to queue up everything up to a picture unit */
-  if (strcmp (collect_pad->track->codec_id,
+  if (collect_pad->track->codec_id != NULL &&
+      strcmp (collect_pad->track->codec_id,
           GST_MATROSKA_CODEC_ID_VIDEO_DIRAC) == 0) {
     buf = gst_matroska_mux_handle_dirac_packet (mux, collect_pad, buf);
     if (!buf)