summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-01-31 03:53:34 +0100
committerwm4 <wm4@nowhere>2018-01-31 03:54:59 +0100
commita9f97b26d8c6037521ef50f0c80c3eaf90724a4e (patch)
tree1bfb9c04bfe2ee39fd87d5178a19c498145ccf40
parente197ca3dd5d9f5e3f1ea89a35d0cb8de6cb36cf8 (diff)
downloadmpv-a9f97b26d8c6037521ef50f0c80c3eaf90724a4e.tar.bz2
mpv-a9f97b26d8c6037521ef50f0c80c3eaf90724a4e.tar.xz
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).
-rw-r--r--demux/demux_mkv.c5
1 files changed, 4 insertions, 1 deletions
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: ");