Mercurial > mplayer.hg
changeset 21029:1f2ba24b4e47
Clarify that some of the non-SIMD code is now LGPLed.
All the authours of such code agreed.
| author | lucabe |
|---|---|
| date | Sun, 19 Nov 2006 10:38:12 +0000 |
| parents | 22b8d2ea10a0 |
| children | 1c6d131163b6 |
| files | libswscale/rgb2rgb.c libswscale/rgb2rgb.h libswscale/rgb2rgb_template.c libswscale/swscale.c libswscale/swscale.h libswscale/swscale_internal.h libswscale/swscale_template.c |
| diffstat | 7 files changed, 34 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/rgb2rgb.c Sun Nov 19 10:37:42 2006 +0000 +++ b/libswscale/rgb2rgb.c Sun Nov 19 10:38:12 2006 +0000 @@ -22,6 +22,9 @@ * You should have received a copy of the GNU General Public License * along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * the C code (not assembly, mmx, ...) of this file can be used + * under the LGPL license too */ #include <inttypes.h> #include "config.h"
--- a/libswscale/rgb2rgb.h Sun Nov 19 10:37:42 2006 +0000 +++ b/libswscale/rgb2rgb.h Sun Nov 19 10:38:12 2006 +0000 @@ -9,18 +9,18 @@ * * This file is part of FFmpeg. * - * FFmpeg 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. + * FFmpeg 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. * * FFmpeg 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. + * 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 General Public License - * along with FFmpeg; if not, write to the Free Software + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
--- a/libswscale/rgb2rgb_template.c Sun Nov 19 10:37:42 2006 +0000 +++ b/libswscale/rgb2rgb_template.c Sun Nov 19 10:38:12 2006 +0000 @@ -23,6 +23,9 @@ * You should have received a copy of the GNU General Public License * along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * the C code (not assembly, mmx, ...) of this file can be used + * under the LGPL license too */ #include <stddef.h>
--- a/libswscale/swscale.c Sun Nov 19 10:37:42 2006 +0000 +++ b/libswscale/swscale.c Sun Nov 19 10:38:12 2006 +0000 @@ -17,8 +17,8 @@ * along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * the C code (not assembly, mmx, ...) of the swscaler which has been written - * by Michael Niedermayer can be used under the LGPL license too + * the C code (not assembly, mmx, ...) of this file can be used + * under the LGPL license too */ /*
--- a/libswscale/swscale.h Sun Nov 19 10:37:42 2006 +0000 +++ b/libswscale/swscale.h Sun Nov 19 10:38:12 2006 +0000 @@ -3,22 +3,19 @@ * * This file is part of FFmpeg. * - * FFmpeg 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. + * FFmpeg 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. * * FFmpeg 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. + * 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 General Public License - * along with FFmpeg; if not, write to the Free Software + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * the C code (not assembly, mmx, ...) of the swscaler which has been written - * by Michael Niedermayer can be used under the LGPL license too */ #ifndef SWSCALE_H
--- a/libswscale/swscale_internal.h Sun Nov 19 10:37:42 2006 +0000 +++ b/libswscale/swscale_internal.h Sun Nov 19 10:38:12 2006 +0000 @@ -3,22 +3,19 @@ * * This file is part of FFmpeg. * - * FFmpeg 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. + * FFmpeg 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. * * FFmpeg 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. + * 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 General Public License - * along with FFmpeg; if not, write to the Free Software + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * the C code (not assembly, mmx, ...) of the swscaler which has been written - * by Michael Niedermayer can be used under the LGPL license too */ #ifndef SWSCALE_INTERNAL_H
--- a/libswscale/swscale_template.c Sun Nov 19 10:37:42 2006 +0000 +++ b/libswscale/swscale_template.c Sun Nov 19 10:38:12 2006 +0000 @@ -17,8 +17,8 @@ * along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * the C code (not assembly, mmx, ...) of the swscaler which has been written - * by Michael Niedermayer can be used under the LGPL license too + * the C code (not assembly, mmx, ...) of this file can be used + * under the LGPL license too */ #undef REAL_MOVNTQ