>From cf405bdf5e4c0d9c6b08acdc9cac9013012792e3 Mon Sep 17 00:00:00 2001 From: strites Date: Sun, 4 May 2008 13:03:52 +0200 Subject: [PATCH] License of "swscale_avoption.h" and "x86/swscale_constants.h" is LGPL --- swscale_avoption.h | 20 +++++++++----------- x86/swscale_constants.h | 19 ++++++++----------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/swscale_avoption.h b/swscale_avoption.h index aaef8cb..fc97b75 100644 --- a/swscale_avoption.h +++ b/swscale_avoption.h @@ -3,23 +3,21 @@ * * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * the C code (not assembly, mmx, ...) of this file can be used - * under the LGPL license too */ + #ifndef FFMPEG_SWSCALE_AVOPTION_H #define FFMPEG_SWSCALE_AVOPTION_H diff --git a/x86/swscale_constants.h b/x86/swscale_constants.h index 940bcfc..13343ac 100644 --- a/x86/swscale_constants.h +++ b/x86/swscale_constants.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 Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * the C code (not assembly, mmx, ...) of this file can be used - * under the LGPL license too */ #ifndef FFMPEG_X86_SWSCALE_CONSTANTS_H -- 1.5.3.7