summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-09-21 13:50:18 +0200
committerwm4 <wm4@nowhere>2017-09-21 13:56:27 +0200
commitbfa9b628589068acdbb04d97f86051063e82fd94 (patch)
tree03e9ffbf6a245d8a3f85b37ef80d74ad0df254ff /player
parentfdb300b983744c522f335ccf64e9788b78f86701 (diff)
downloadmpv-bfa9b628589068acdbb04d97f86051063e82fd94.tar.bz2
mpv-bfa9b628589068acdbb04d97f86051063e82fd94.tar.xz
build: add preliminary LGPL mode
See "Copyright" file for caveats. This changes the remaining "almost LGPL" files to LGPL, because we think that the conditions the author set for these was finally fulfilled.
Diffstat (limited to 'player')
-rw-r--r--player/audio.c2
-rw-r--r--player/command.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/player/audio.c b/player/audio.c
index a26a7d1ff5..d32b8b78d6 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -965,7 +965,6 @@ static int decode_new_frame(struct ao_chain *ao_c)
}
}
-#if HAVE_GPL
/* Try to get at least minsamples decoded+filtered samples in outbuf
* (total length including possible existing data).
* Return 0 on success, or negative AD_* error code.
@@ -1064,7 +1063,6 @@ static int filter_audio(struct MPContext *mpctx, struct mp_audio_buffer *outbuf,
return res;
}
-#endif
void reload_audio_output(struct MPContext *mpctx)
{
diff --git a/player/command.h b/player/command.h
index c9410423c7..0ab746b1d2 100644
--- a/player/command.h
+++ b/player/command.h
@@ -13,8 +13,6 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
- *
- * Parts under HAVE_GPL are licensed under GNU General Public License.
*/
#ifndef MPLAYER_COMMAND_H