mirror of https://git.ffmpeg.org/ffmpeg.git
Change license of yadif from GPL to LGPL
Signed-off-by: Robert Krüger <krueger@lesspain.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
6109399366
commit
194ef56ba7
1
LICENSE
1
LICENSE
|
@ -47,7 +47,6 @@ Specifically, the GPL parts of FFmpeg are
|
||||||
- vf_stereo3d.c
|
- vf_stereo3d.c
|
||||||
- vf_super2xsai.c
|
- vf_super2xsai.c
|
||||||
- vf_tinterlace.c
|
- vf_tinterlace.c
|
||||||
- vf_yadif.c
|
|
||||||
- vsrc_mptestsrc.c
|
- vsrc_mptestsrc.c
|
||||||
|
|
||||||
Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then
|
Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then
|
||||||
|
|
|
@ -2371,7 +2371,6 @@ super2xsai_filter_deps="gpl"
|
||||||
tinterlace_filter_deps="gpl"
|
tinterlace_filter_deps="gpl"
|
||||||
vidstabdetect_filter_deps="libvidstab"
|
vidstabdetect_filter_deps="libvidstab"
|
||||||
vidstabtransform_filter_deps="libvidstab"
|
vidstabtransform_filter_deps="libvidstab"
|
||||||
yadif_filter_deps="gpl"
|
|
||||||
pixfmts_super2xsai_test_deps="super2xsai_filter"
|
pixfmts_super2xsai_test_deps="super2xsai_filter"
|
||||||
tinterlace_merge_test_deps="tinterlace_filter"
|
tinterlace_merge_test_deps="tinterlace_filter"
|
||||||
tinterlace_pad_test_deps="tinterlace_filter"
|
tinterlace_pad_test_deps="tinterlace_filter"
|
||||||
|
|
|
@ -2,19 +2,19 @@
|
||||||
* Copyright (C) 2006-2011 Michael Niedermayer <michaelni@gmx.at>
|
* Copyright (C) 2006-2011 Michael Niedermayer <michaelni@gmx.at>
|
||||||
* 2010 James Darnley <james.darnley@gmail.com>
|
* 2010 James Darnley <james.darnley@gmail.com>
|
||||||
*
|
*
|
||||||
* FFmpeg is free software; you can redistribute it and/or modify
|
* FFmpeg is free software; you can redistribute it and/or
|
||||||
* it under the terms of the GNU General Public License as published by
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* License as published by the Free Software Foundation; either
|
||||||
* (at your option) any later version.
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
*
|
*
|
||||||
* FFmpeg is distributed in the hope that it will be useful,
|
* FFmpeg is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* GNU General Public License for more details.
|
* Lesser General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License along
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
* with FFmpeg; if not, write to the Free Software Foundation, Inc.,
|
* License along with FFmpeg; if not, write to the Free Software
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libavutil/avassert.h"
|
#include "libavutil/avassert.h"
|
||||||
|
|
|
@ -6,19 +6,19 @@
|
||||||
;*
|
;*
|
||||||
;* This file is part of FFmpeg.
|
;* This file is part of FFmpeg.
|
||||||
;*
|
;*
|
||||||
;* FFmpeg is free software; you can redistribute it and/or modify
|
;* FFmpeg is free software; you can redistribute it and/or
|
||||||
;* it under the terms of the GNU General Public License as published by
|
;* modify it under the terms of the GNU Lesser General Public
|
||||||
;* the Free Software Foundation; either version 2 of the License, or
|
;* License as published by the Free Software Foundation; either
|
||||||
;* (at your option) any later version.
|
;* version 2.1 of the License, or (at your option) any later version.
|
||||||
;*
|
;*
|
||||||
;* FFmpeg is distributed in the hope that it will be useful,
|
;* FFmpeg is distributed in the hope that it will be useful,
|
||||||
;* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
;* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
;* GNU General Public License for more details.
|
;* Lesser General Public License for more details.
|
||||||
;*
|
;*
|
||||||
;* You should have received a copy of the GNU General Public License along
|
;* You should have received a copy of the GNU Lesser General Public
|
||||||
;* with FFmpeg; if not, write to the Free Software Foundation, Inc.,
|
;* License along with FFmpeg; if not, write to the Free Software
|
||||||
;* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
;******************************************************************************
|
;******************************************************************************
|
||||||
|
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "libavutil/x86/x86util.asm"
|
||||||
|
|
|
@ -3,19 +3,19 @@
|
||||||
*
|
*
|
||||||
* This file is part of FFmpeg.
|
* This file is part of FFmpeg.
|
||||||
*
|
*
|
||||||
* FFmpeg is free software; you can redistribute it and/or modify
|
* FFmpeg is free software; you can redistribute it and/or
|
||||||
* it under the terms of the GNU General Public License as published by
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* License as published by the Free Software Foundation; either
|
||||||
* (at your option) any later version.
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
*
|
*
|
||||||
* FFmpeg is distributed in the hope that it will be useful,
|
* FFmpeg is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* GNU General Public License for more details.
|
* Lesser General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License along
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
* with FFmpeg; if not, write to the Free Software Foundation, Inc.,
|
* License along with FFmpeg; if not, write to the Free Software
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libavutil/attributes.h"
|
#include "libavutil/attributes.h"
|
||||||
|
|
|
@ -7,19 +7,19 @@
|
||||||
;*
|
;*
|
||||||
;* This file is part of FFmpeg.
|
;* This file is part of FFmpeg.
|
||||||
;*
|
;*
|
||||||
;* FFmpeg is free software; you can redistribute it and/or modify
|
;* FFmpeg is free software; you can redistribute it and/or
|
||||||
;* it under the terms of the GNU General Public License as published by
|
;* modify it under the terms of the GNU Lesser General Public
|
||||||
;* the Free Software Foundation; either version 2 of the License, or
|
;* License as published by the Free Software Foundation; either
|
||||||
;* (at your option) any later version.
|
;* version 2.1 of the License, or (at your option) any later version.
|
||||||
;*
|
;*
|
||||||
;* FFmpeg is distributed in the hope that it will be useful,
|
;* FFmpeg is distributed in the hope that it will be useful,
|
||||||
;* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
;* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
;* GNU General Public License for more details.
|
;* Lesser General Public License for more details.
|
||||||
;*
|
;*
|
||||||
;* You should have received a copy of the GNU General Public License along
|
;* You should have received a copy of the GNU Lesser General Public
|
||||||
;* with FFmpeg; if not, write to the Free Software Foundation, Inc.,
|
;* License along with FFmpeg; if not, write to the Free Software
|
||||||
;* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
;******************************************************************************
|
;******************************************************************************
|
||||||
|
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "libavutil/x86/x86util.asm"
|
||||||
|
|
|
@ -7,19 +7,19 @@
|
||||||
;*
|
;*
|
||||||
;* This file is part of FFmpeg.
|
;* This file is part of FFmpeg.
|
||||||
;*
|
;*
|
||||||
;* FFmpeg is free software; you can redistribute it and/or modify
|
;* FFmpeg is free software; you can redistribute it and/or
|
||||||
;* it under the terms of the GNU General Public License as published by
|
;* modify it under the terms of the GNU Lesser General Public
|
||||||
;* the Free Software Foundation; either version 2 of the License, or
|
;* License as published by the Free Software Foundation; either
|
||||||
;* (at your option) any later version.
|
;* version 2.1 of the License, or (at your option) any later version.
|
||||||
;*
|
;*
|
||||||
;* FFmpeg is distributed in the hope that it will be useful,
|
;* FFmpeg is distributed in the hope that it will be useful,
|
||||||
;* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
;* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
;* GNU General Public License for more details.
|
;* Lesser General Public License for more details.
|
||||||
;*
|
;*
|
||||||
;* You should have received a copy of the GNU General Public License along
|
;* You should have received a copy of the GNU Lesser General Public
|
||||||
;* with FFmpeg; if not, write to the Free Software Foundation, Inc.,
|
;* License along with FFmpeg; if not, write to the Free Software
|
||||||
;* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
;******************************************************************************
|
;******************************************************************************
|
||||||
|
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "libavutil/x86/x86util.asm"
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
/*
|
/*
|
||||||
* This file is part of FFmpeg.
|
* This file is part of FFmpeg.
|
||||||
*
|
*
|
||||||
* FFmpeg is free software; you can redistribute it and/or modify
|
* FFmpeg is free software; you can redistribute it and/or
|
||||||
* it under the terms of the GNU General Public License as published by
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* License as published by the Free Software Foundation; either
|
||||||
* (at your option) any later version.
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
*
|
*
|
||||||
* FFmpeg is distributed in the hope that it will be useful,
|
* FFmpeg is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* GNU General Public License for more details.
|
* Lesser General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License along
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
* with FFmpeg; if not, write to the Free Software Foundation, Inc.,
|
* License along with FFmpeg; if not, write to the Free Software
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef AVFILTER_YADIF_H
|
#ifndef AVFILTER_YADIF_H
|
||||||
|
|
Loading…
Reference in New Issue