Commit a2f05d33 authored by Arwa Arif's avatar Arwa Arif Committed by Michael Niedermayer

lavfi : change xBR filter to LGPL

Hyllian's message : "Hi, Put lgpl on this and use it as you wish. It's free!"
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7d37e45f
...@@ -49,7 +49,6 @@ Specifically, the GPL parts of FFmpeg are: ...@@ -49,7 +49,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_xbr.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
......
...@@ -2608,7 +2608,6 @@ vidstabtransform_filter_deps="libvidstab" ...@@ -2608,7 +2608,6 @@ vidstabtransform_filter_deps="libvidstab"
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"
xbr_filter_deps="gpl"
zmq_filter_deps="libzmq" zmq_filter_deps="libzmq"
zoompan_filter_deps="swscale" zoompan_filter_deps="swscale"
......
...@@ -5,19 +5,23 @@ ...@@ -5,19 +5,23 @@
* *
* Copyright (c) 2014 Arwa Arif <arwaarif1994@gmail.com> * Copyright (c) 2014 Arwa Arif <arwaarif1994@gmail.com>
* *
* FFmpeg is free software; you can redistribute it and/or modify * Changed from GPL to LGPL, in accordance with Hyllian's message:
* it under the terms of the GNU General Public License as published by * On Tue, Nov 11, 2014 at 11:52 PM, Sérgio <sergiogdb@gmail.com> wrote:
* the Free Software Foundation; either version 2 of the License, or * > Hi, Put lgpl on this and use it as you wish. It's free!
* (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, * 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
*/ */
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment