[MPlayer-cvslog] r32837 - in trunk: TOOLS/aconvert.sh TOOLS/binary_codecs.sh TOOLS/divx2svcd.sh TOOLS/mencvcd.sh TOOLS/midentify.sh TOOLS/mpconsole.sh libaf/af_resample_template.c libmpeg2/libmpeg2_changes.diff lib...

[Clément Bœsch]

On Mon, Jan 31, 2011 at 04:45:46PM +0100, cboesch wrote:
> Author: cboesch
> Date: Mon Jan 31 16:45:46 2011
> New Revision: 32837
> 
> Log:
> Revert 32836: Uoti Urpala did not approved the relicensing.
> 
> vo_vdpau contains some of his code (see at least r29777).
> 

Sorry I did not wait until tonight since it's a legal issue. Btw, why was
there a relicensing?

> Modified:
>    trunk/TOOLS/aconvert.sh   (props changed)
>    trunk/TOOLS/binary_codecs.sh   (props changed)
>    trunk/TOOLS/divx2svcd.sh   (props changed)
>    trunk/TOOLS/mencvcd.sh   (props changed)
>    trunk/TOOLS/midentify.sh   (props changed)
>    trunk/TOOLS/mpconsole.sh   (props changed)
>    trunk/libaf/af_resample_template.c   (props changed)
>    trunk/libmpeg2/libmpeg2_changes.diff   (props changed)
>    trunk/libvo/vo_vdpau.c
>    trunk/stream/stream_live555.c   (props changed)
>    trunk/stream/stream_netstream.h   (props changed)
> 

I don't understand this. From a clean checkout, all I did was:

  svn merge --revision 32836:32835 .
  svn ci ..

-- 
Clément B.