[FFmpeg-devel] [FFMPEG][OPW] FFmpeg OPW libavfilter task

[arwa arif]

On Fri, Nov 14, 2014 at 4:30 PM, Michael Niedermayer <michael at niedermayer.cc
> wrote:

> On Fri, Nov 14, 2014 at 01:23:14PM +0530, arwa arif wrote:
> > On Fri, Nov 14, 2014 at 7:21 AM, Michael Niedermayer
> <michael at niedermayer.cc
> > > wrote:
> >
> > > Hi
> > >
> > > On Wed, Nov 12, 2014 at 11:24:00AM +0100, Stefano Sabatini wrote:
> > > > In data Wednesday 2014-11-12 00:26:26 +0530, arwa arif ha scritto:
> > > > > I talked to Sergio. This is his reply -
> > > > > "Hi, Put lgpl on this and use it as you wish. It's free!
> > > > >
> > > > > Sissi"
> > > >
> > > > OK, so I assume it's safe to relicense to LGPL.
> > >
> > > i guess, yes
> > >
> > > arwa, can you post a patch which replaces the GPL by LGPL in xbr
> > > and remove xbr from all gpl specific listings ?
> > > I think stefano is a bit busy atm
> > >
> > > also probably best to copy the authors response in the commit message
> > > or state that he agreed to the change
> > >
> > > Thanks
> > >
> > >
> > Updated the patch.
>
> you forgot to update your git after xbr was pushed.
> the patch should be on top of the current git master in which xbr
> is already. So it wouldnt add a xbr with differnet license but rather
> replace the license in the already existing xbr filter.
>
> you can update your git with
> git pull --rebase
> this will then result in some conflicts due to 2 slightly different
> vf_xbr.c files and other small changes clement did in the meantime
> in ffmpeg git
> you have to edit the files and resolve/remove the conflicts
> then add the files you changed with git add
> and then run git rebase --continue
>
> then make sure the chnages you have after that are the ones you
> want
> the "pull --rebase" likely will have added the xbr filter back in
> configure and LICENSE.md so you have to remove them again
>
> Also add the Note about "Hi, Put lgpl on this and use it as you wish. It's
> free!"
> to the commit message
> you can edit the commit message with
> git commit --amend
>
> And the License header at the top of vf_xbr.c should be replaced
> by the LGPL one (just copy it from another file).
>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> No human being will ever know the Truth, for even if they happen to say it
> by chance, they would not even known they had done so. -- Xenophanes
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-lavfi-xBR-filter.patch
Type: text/x-patch
Size: 1820 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20141115/8e3a16a3/attachment.bin>