[FFmpeg-devel] libswscale/yuv2rgb_init.c license
Diego Biurrun
diego
Mon Jul 9 11:26:24 CEST 2007
On Mon, Jul 09, 2007 at 11:00:04AM +0200, Luca Abeni wrote:
>
> Luca Abeni wrote:
> >
> > Diego Biurrun wrote:
> > [...]
> >>> I think the file is still in svn history, no? So, if needed it can be
> >>> "resurrected", and the header can be fixed in the proper way.
> >> I think that would be the best solution so that nobody that resurrects
> >> the file in the future gets into the same troubles that you had.
> >
> > Ok, tomorrow I'll look at recovering the file from svn, putting a
> > reasonable license header on it, and removing the updated version.
>
> Sorry for the delay; I've been preempted by some other things... Anyway,
> I am going to do this operation asap. Only a little question, before
> doing something wrong with subversion ;-). Here is what I plan to do:
> 1) svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
> 2) cd ffmpeg/libswscale
> 3) svn cp -r 23714
> svn://svn.mplayerhq.hu/mplayer/trunk/libswscale/yuv2rgb_init.c
> yuv2rgb_init.c
> 4) edit yuv2rgb_init.c, adding the license header from yuv2rgb.c
> 5) svn commit yuv2rgb_init.c
> 6) svn rm yuv2rgb_init.c
> 7) svn commit
>
> Is this ok? Or should I add an "svn commit" between step 3) and 4)? Or
> can I remove step 5)? I am asking to avoid doing the thing in the wrong
> way, and having to play some other "svn games" to recover from my error...
The order of commands you have planned is OK.
However, I wonder why you wish to use the (mpeg2dec) license header from
yuv2rgb.c? Is the file derived from yuv2rgb.c? I'm asking since it was
not created via 'svn copy'. Also, I think there should be a short note
about the (re)licensing troubles you encountered. Maybe wait a day or
two before removing the file again so we have a chance to comment. Or
even better, paste the header here before doing the changes.
Diego
More information about the ffmpeg-devel
mailing list