Browse Source

Clarify that some of the non-SIMD code is now LGPLed.

All the authours of such code agreed.

Originally committed as revision 21045 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
tags/v0.5
Luca Abeni 19 years ago
parent
commit
807e0c6645
7 changed files with 34 additions and 34 deletions
  1. +3
    -0
      libswscale/rgb2rgb.c
  2. +8
    -8
      libswscale/rgb2rgb.h
  3. +3
    -0
      libswscale/rgb2rgb_template.c
  4. +2
    -2
      libswscale/swscale.c
  5. +8
    -11
      libswscale/swscale.h
  6. +8
    -11
      libswscale/swscale_internal.h
  7. +2
    -2
      libswscale/swscale_template.c

+ 3
- 0
libswscale/rgb2rgb.c View File

@@ -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"


+ 8
- 8
libswscale/rgb2rgb.h View File

@@ -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
*/



+ 3
- 0
libswscale/rgb2rgb_template.c View File

@@ -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>


+ 2
- 2
libswscale/swscale.c View File

@@ -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
*/

/*


+ 8
- 11
libswscale/swscale.h View File

@@ -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


+ 8
- 11
libswscale/swscale_internal.h View File

@@ -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


+ 2
- 2
libswscale/swscale_template.c View File

@@ -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


Loading…
Cancel
Save