diff options
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/rgb2rgb.c | 3 | ||||
| -rw-r--r-- | libswscale/rgb2rgb.h | 16 | ||||
| -rw-r--r-- | libswscale/rgb2rgb_template.c | 3 | ||||
| -rw-r--r-- | libswscale/swscale.c | 4 | ||||
| -rw-r--r-- | libswscale/swscale.h | 19 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 19 | ||||
| -rw-r--r-- | libswscale/swscale_template.c | 4 |
7 files changed, 34 insertions, 34 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 0287202691..2bb5d3355a 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -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" diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index 8de62d9448..4b5cc0a690 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -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 */ diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index 0dbc657ced..d9511c955a 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -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> diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a993777039..eb9092c198 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -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 */ /* diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 96978a03a7..06088b8e49 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -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 diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index dbeee7d978..837b6eaf5e 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -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 diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index fca7cb50f4..3725979bd1 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -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 |