From 963c9aa3d5dc9514f6b4bdb9cc952454f2d83c3b Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 20 Apr 2013 23:40:41 +0200
Subject: demux_mkv: always set track->codec_id to a string

Otherwise audio/video/sub track handling code would dereference the NULL
pointer.
---
 demux/demux_mkv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index d8159ac1e2..f92d091b72 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -602,8 +602,10 @@ static void parse_trackentry(struct demuxer *demuxer,
             track->ms_compat = 1;
         mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |  + Codec ID: %s\n",
                track->codec_id);
-    } else
+    } else {
         mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Missing codec ID!\n");
+        track->codec_id = "";
+    }
 
     if (entry->n_codec_private) {
         int len = entry->codec_private.len;
-- 
cgit v1.2.3