diff options
| -rw-r--r-- | demux/demux_mkv.c | 16 | ||||
| -rw-r--r-- | waftools/generators/headers.py | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index d564999fc6..abea342ed2 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -6,18 +6,18 @@ * * This file is part of mpv. * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see <http://www.gnu.org/licenses/>. */ #include <stdlib.h> @@ -647,7 +647,9 @@ static void parse_trackentry(struct demuxer *demuxer, if (entry->name) { track->name = talloc_strdup(track, entry->name); +#if HAVE_GPL MP_VERBOSE(demuxer, "| + Name: %s\n", track->name); +#endif } track->type = entry->track_type; diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py index 84f914c2c1..c7f5b48b84 100644 --- a/waftools/generators/headers.py +++ b/waftools/generators/headers.py @@ -29,6 +29,7 @@ def __add_mpv_defines__(ctx): ctx.define("CONFIGURATION", " ".join(argv)) ctx.define("MPV_CONFDIR", ctx.env.CONFLOADDIR) ctx.define("FULLCONFIG", __escape_c_string(__get_features_string__(ctx))) + ctx.define("HAVE_GPL", 1) def configure(ctx): __add_mpv_defines__(ctx) |