summaryrefslogtreecommitdiffstats
path: root/Copyright
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-05-11 11:00:15 +0200
committerwm4 <wm4@nowhere>2017-05-11 11:25:45 +0200
commitfaefbbaaa589191aa03070043aaac581a3dcd0d8 (patch)
tree1560fc1496ebb9218a60c71d9d7ad04004c8ed83 /Copyright
parent99cef59fc9a4d33ebbbb4405ec86faf0ff213f0c (diff)
downloadmpv-faefbbaaa589191aa03070043aaac581a3dcd0d8.tar.bz2
mpv-faefbbaaa589191aa03070043aaac581a3dcd0d8.tar.xz
af_format: change license to LGPL
This case is a bit weird, because MPlayer certainly also has a file named af_format.c. Both appear to have the function of converting audio data between sample formats. However, mpv's af_format.c is a rewrite, and doesn't actually do conversion by itself. It's similar to vf_format.c, and forces the generic filter chain code to insert conversion filters, instead of doing conversion explicitly. mpv's current af_format.c started out as af_force.c in d9582ad0a41. It was renamed to af_format.c in e60b8f181d, while the old af_format.c was split into two new filters. In 943c785619 the filename was changed to af_format.c as well. The new af_format.c does not contain any libaf code, except for some potentially copy & pasted skeleton and boilerplate code. (We don't account for this in per-filter file licenses, as the old libaf code has to be removed fully, at which point the filters will have to be ported to another framework, which will removed that boilerplate code.) The old filters based on af_format.c were progressively replaced and removed. Support for non-native endian and formats with signedness different from native FFmpeg was completely removed in 831d7c3c400b. The old 24 bit conversion code was removed in 552dc0d564 (made unnecessary by 5a9f817bfde8). Also list hwdec_vaglx.c as GPL-only, which doesn't have anything to do with this commit.
Diffstat (limited to 'Copyright')
-rw-r--r--Copyright3
1 files changed, 2 insertions, 1 deletions
diff --git a/Copyright b/Copyright
index 8ac7c479c2..b6af687686 100644
--- a/Copyright
+++ b/Copyright
@@ -62,7 +62,7 @@ LGPL relicensing status:
audio/filter/af_volume.c must be killed (main author disagreed)
audio/filter/equalizer.h must be killed (main author disagreed)
audio/filter/tools.c must be killed (main author disagreed)
- audio/filter/af_format.c easy
+ audio/filter/af_format.c LGPL
audio/filter/af_lavc3enc.c LGPL
audio/filter/af_lavfi.c LGPL
audio/filter/af_scaletempo.c LGPL
@@ -303,6 +303,7 @@ LGPL relicensing status:
video/out/dither.* LGPL
video/out/drm_common.* LGPL
video/out/filter_kernels.* LGPL (BSD)
+ video/out/opengl/hwdec_vaglx.c GPL
video/out/opengl/* LGPL
video/out/vo.c LGPL
video/out/vo.h LGPL