summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-04-20 23:40:41 +0200
committerwm4 <wm4@nowhere>2013-04-20 23:40:41 +0200
commit963c9aa3d5dc9514f6b4bdb9cc952454f2d83c3b (patch)
tree8ade022daa3ea01d6ce350ce6911850ba8ba4653 /demux
parent6627cf81cc9f2ab9ef0850f21beae5b59d009e77 (diff)
downloadmpv-963c9aa3d5dc9514f6b4bdb9cc952454f2d83c3b.tar.bz2
mpv-963c9aa3d5dc9514f6b4bdb9cc952454f2d83c3b.tar.xz
demux_mkv: always set track->codec_id to a string
Otherwise audio/video/sub track handling code would dereference the NULL pointer.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_mkv.c4
1 files changed, 3 insertions, 1 deletions
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;