virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

vf_yadif: Relicense from GPL to LGPL

Browse Source 
All copyright holders have agreed to the relicensing.
This commit is contained in:
Robert Krüger 2014-01-05 19:53:11 +01:00 committed by Diego Biurrun
parent 46bacb5cc6
commit d8e763fda7
6 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LICENSE
View File

@ -21,7 +21,6 @@ Specifically, the GPL parts of Libav are
- vf_cropdetect.c - vf_cropdetect.c
- vf_delogo.c - vf_delogo.c
- vf_hqdn3d.c - vf_hqdn3d.c
- vf_yadif.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
the configure parameter --enable-version3 will activate this licensing option the configure parameter --enable-version3 will activate this licensing option

1
configure vendored
View File

@ -2012,7 +2012,6 @@ interlace_filter_deps="gpl"
resample_filter_deps="avresample" resample_filter_deps="avresample"
ocv_filter_deps="libopencv" ocv_filter_deps="libopencv"
scale_filter_deps="swscale" scale_filter_deps="swscale"
yadif_filter_deps="gpl"
# examples # examples
output_example_deps="avcodec avformat avutil swscale" output_example_deps="avcodec avformat avutil swscale"

18
libavfilter/vf_yadif.c
View File

@ -4,19 +4,19 @@
* *
* This file is part of Libav. * This file is part of Libav.
* *
* Libav is free software; you can redistribute it and/or modify * Libav 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.
* *
* Libav is distributed in the hope that it will be useful, * Libav 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 Libav; if not, write to the Free Software Foundation, Inc., * License along with Libav; 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/cpu.h" #include "libavutil/cpu.h"

18
libavfilter/x86/vf_yadif.asm
View File

@ -6,19 +6,19 @@
;* ;*
;* This file is part of Libav. ;* This file is part of Libav.
;* ;*
;* Libav is free software; you can redistribute it and/or modify ;* Libav 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.
;* ;*
;* Libav is distributed in the hope that it will be useful, ;* Libav 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 Libav; if not, write to the Free Software Foundation, Inc., ;* License along with Libav; 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"

18
libavfilter/x86/vf_yadif_init.c
View File

@ -3,19 +3,19 @@
* *
* This file is part of Libav. * This file is part of Libav.
* *
* Libav is free software; you can redistribute it and/or modify * Libav 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.
* *
* Libav is distributed in the hope that it will be useful, * Libav 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 Libav; if not, write to the Free Software Foundation, Inc., * License along with Libav; 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"

18
libavfilter/yadif.h
View File

@ -1,19 +1,19 @@
/* /*
* This file is part of Libav. * This file is part of Libav.
* *
* Libav is free software; you can redistribute it and/or modify * Libav 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.
* *
* Libav is distributed in the hope that it will be useful, * Libav 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 Libav; if not, write to the Free Software Foundation, Inc., * License along with Libav; 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