diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2008-11-20 14:30:40 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-11-20 14:30:40 +0000 |
| commit | fe7d1d7ae0ffabbd19ace6900e1dd9b83e22e95c (patch) | |
| tree | 20644be2749a57bc7622f24b0ea08a31a7565aa9 | |
| parent | 968bee1f95d6c399ce32a1ae5fa1cd4e2d5b2744 (diff) | |
gst/matroska/matroska-mux.c: Fix NULL pointer dereference of an unset codec_id in the recently added Dirac paths
Original commit message from CVS:
* gst/matroska/matroska-mux.c:
Fix NULL pointer dereference of an unset codec_id in the recently
added Dirac paths
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gst/matroska/matroska-mux.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,11 @@ 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: Just keep disabling elements that hang the states test until it works. diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 866157fe..97c4333c 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) |