diff options
| -rw-r--r-- | Copyright | 8 | ||||
| -rw-r--r-- | audio/out/ao_lavc.c | 15 | ||||
| -rw-r--r-- | common/encode.h | 21 | ||||
| -rw-r--r-- | common/encode_lavc.c | 15 | ||||
| -rw-r--r-- | common/encode_lavc.h | 15 | ||||
| -rw-r--r-- | video/out/vo_lavc.c | 14 |
6 files changed, 56 insertions, 32 deletions
@@ -86,7 +86,7 @@ LGPL relicensing status: audio/out/ao_coreaudio_utils.c LGPL audio/out/ao_coreaudio_utils.h LGPL audio/out/ao_jack.c will stay GPL - audio/out/ao_lavc.c probably easy + audio/out/ao_lavc.c LGPL audio/out/ao_null.c LGPL audio/out/ao_openal.c unknown audio/out/ao_opensles.c LGPL @@ -114,8 +114,8 @@ LGPL relicensing status: common/av_log.h LGPL common/codecs.* LGPL common/common.* LGPL - common/encode.h unknown - common/encode_lavc.* unknown + common/encode.h LGPL + common/encode_lavc.* LGPL common/global.h LGPL common/msg.c almost LGPL common/msg_control.h LGPL @@ -318,7 +318,7 @@ LGPL relicensing status: video/out/vo_direct3d.c unknown video/out/vo_drm.c LGPL video/out/vo_image.c unknown - video/out/vo_lavc.c unknown + video/out/vo_lavc.c LGPL video/out/vo_null.c LGPL video/out/vo_opengl.c LGPL video/out/vo_opengl_cb.c LGPL diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index 4dbc55a369..619f4fe72a 100644 --- a/audio/out/ao_lavc.c +++ b/audio/out/ao_lavc.c @@ -1,22 +1,23 @@ /* * audio encoding using libavformat + * * Copyright (C) 2011-2012 Rudolf Polzer <divVerent@xonotic.org> * NOTE: this file is partially based on ao_pcm.c by Atmosfear * * 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 <stdio.h> 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 diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 5c7406d4b9..be7de127f4 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -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 <stdio.h> |