diff --git a/Copyright b/Copyright index c71ee4c0ad..004e0bf1c8 100644 --- a/Copyright +++ b/Copyright @@ -116,7 +116,7 @@ x audio/audio.* very hard (mp_audio based of anders' af_audi audio/chmap.* LGPL audio/chmap_sel.* LGPL audio/fmt-conversion.* LGPL -x audio/format.* hard (murky libaf origins) + audio/format.* LGPL common/av_common.* LGPL common/av_log.c almost LGPL common/av_log.h LGPL diff --git a/audio/format.c b/audio/format.c index bbe0cec9bb..efbb605d98 100644 --- a/audio/format.c +++ b/audio/format.c @@ -3,26 +3,21 @@ * * 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 . + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . */ -#include -#include -#include -#include #include -#include #include "common/common.h" #include "audio/filter/af.h" diff --git a/audio/format.h b/audio/format.h index 3d5cc1024b..ace19da5e5 100644 --- a/audio/format.h +++ b/audio/format.h @@ -1,22 +1,18 @@ /* - * The sample format system used lin libaf is based on bitmasks. - * The format definition only refers to the storage format, - * not the resolution. - * * 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 . + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . */ #ifndef MPLAYER_AF_FORMAT_H