diff options
author | Rudolf Polzer <divverent@xonotic.org> | 2017-06-13 14:22:15 -0400 |
---|---|---|
committer | Rudolf Polzer <divverent@xonotic.org> | 2017-06-13 14:22:15 -0400 |
commit | e2573e5b8d815ac2a1c3f56d743a1e9bf712138d (patch) | |
tree | 5b7bd35a08fc0e7ecc9be2c000a1636dafedc352 /common | |
parent | 3bbb6078a5aa10022fb4817bbbe14050951521ee (diff) | |
download | mpv-e2573e5b8d815ac2a1c3f56d743a1e9bf712138d.tar.bz2 mpv-e2573e5b8d815ac2a1c3f56d743a1e9bf712138d.tar.xz |
encode_lavc: move from GPL 2+ to LGPL 2.1+.
Diffstat (limited to 'common')
-rw-r--r-- | common/encode.h | 21 | ||||
-rw-r--r-- | common/encode_lavc.c | 15 | ||||
-rw-r--r-- | common/encode_lavc.h | 15 |
3 files changed, 37 insertions, 14 deletions
diff --git a/common/encode.h b/common/encode.h index 996fe66857..e0e39e91cb 100644 --- a/common/encode.h +++ b/common/encode.h @@ -1,3 +1,24 @@ +/* + * Muxing/encoding API; ffmpeg specific implementation is in encode_lavc.*. + * + * Copyright (C) 2011-2012 Rudolf Polzer <divVerent@xonotic.org> + * + * This file is part of mpv. + * + * 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef MPLAYER_ENCODE_H #define MPLAYER_ENCODE_H diff --git a/common/encode_lavc.c b/common/encode_lavc.c index 3563def4e7..5fbad39d44 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -1,22 +1,23 @@ /* * muxing using libavformat + * * Copyright (C) 2010 Nicolas George <george@nsup.org> * Copyright (C) 2011-2012 Rudolf Polzer <divVerent@xonotic.org> * * 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 <libavutil/avutil.h> diff --git a/common/encode_lavc.h b/common/encode_lavc.h index 7bfe4e4a8f..b18238128b 100644 --- a/common/encode_lavc.h +++ b/common/encode_lavc.h @@ -1,21 +1,22 @@ /* * muxing using libavformat + * * Copyright (C) 2011 Rudolf Polzer <divVerent@xonotic.org> * * 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/>. */ #ifndef MPLAYER_ENCODE_LAVC_H |