From b7f90be567c3c19eb3fec30be2b76775296a6ed1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 10 Oct 2017 17:35:47 +0200 Subject: [PATCH] demux_mkv: remove remaining GPL code Fuck this thing. --- Copyright | 1 - demux/demux_mkv.c | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Copyright b/Copyright index 094ba102b0..7e31a91e7f 100644 --- a/Copyright +++ b/Copyright @@ -106,7 +106,6 @@ The following files are still GPL only (--enable-lgpl disables them): The following files contain some optional GPL code (--enable-lgpl disables it): input/cmd_list.c potentially some commands - demux/demux_mkv.c some verbose message options/options.c --frames option options/parse_commandline.c dvd:// expansion player/audio.c libaf glue code diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 3256c5f389..c95de36f00 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -18,8 +18,6 @@ * * You should have received a copy of the GNU Lesser General Public * License along with mpv. If not, see . - * - * Parts under HAVE_GPL are licensed under GNU General Public License. */ #include @@ -702,12 +700,7 @@ static void parse_trackentry(struct demuxer *demuxer, } track->uid = entry->track_uid; - if (entry->name) { - track->name = talloc_strdup(track, entry->name); -#if HAVE_GPL - MP_VERBOSE(demuxer, "| + Name: %s\n", track->name); -#endif - } + track->name = talloc_strdup(track, entry->name); track->type = entry->track_type; MP_VERBOSE(demuxer, "| + Track type: ");