From a9f97b26d8c6037521ef50f0c80c3eaf90724a4e Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 31 Jan 2018 03:53:34 +0100 Subject: Revert "demux_mkv: remove remaining GPL code" This reverts commit b7f90be567c3c19eb3fec30be2b76775296a6ed1. The author agreed to the relicensing now (if that code is affected by the original copyright at all - that was the only line possibly left of it). --- demux/demux_mkv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'demux/demux_mkv.c') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 76fc70976f..e939f0ae2a 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -704,7 +704,10 @@ static void parse_trackentry(struct demuxer *demuxer, } track->uid = entry->track_uid; - track->name = talloc_strdup(track, entry->name); + if (entry->name) { + track->name = talloc_strdup(track, entry->name); + MP_VERBOSE(demuxer, "| + Name: %s\n", track->name); + } track->type = entry->track_type; MP_VERBOSE(demuxer, "| + Track type: "); -- cgit v1.2.3