mirror of
https://github.com/mpv-player/mpv.git
synced 2026-05-07 20:02:49 +00:00
demux_mkv: change license to LGPL
Most contributors have agreed. This claims it's based on gstreamer code, but this was LGPL at the time (and still is). Contributors whose code was removed were not accounted for. There are still some potentially problematic cases:06eee1b67is potentially the most problematic case. Most of these changes are gone due to mpv not using BITMAPINFOHEADER anymore. Some of the other changes are rather trivial. If someone contests this and claims that copyrightable changes are left, the original change can simply be reverted.62bfae140has only 2 lines left: a "char *name;" struct field, and a line that prints a message. All other code was removed. The parsing code in particular was made declarative, which replaced reading this element explicitly (and other elements, see1b22101c77). I'm putting the log message under HAVE_GPL, but I don't think the declaration is copyrightable, or the mere concept of reading this element. Redoing the other 2 lines of code would result in the same program text.d41e860bawas applied by someone who (potentially) disagreed. The patch itself is from someone who did agree, though. It's unknown whether the applier changed the patch. But it seems unlikely, and the change was mostly rewritten.50a86fcc3all demux_mkv changes were reverted (old stdout slave mode)3a406e94dsame2e40bfa13the old MPlayer subtitle code was completely removed316bb1d44completely removed in1cf4802c1d87f93d9d7same11bfc6780relative seeks were removed in92ba630796be54f4813the corresponding demux_mkv code was removed in5dabaaf093efd53eed6all internal vobsub handling is now in FFmpegd7f693a20removed inf3db4b0b93e8a1b3713removed in522ee6b783cfb890259removed, see6b1374b203for analysisc80808b5asame
This commit is contained in:
+9
-7
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user