[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...

[cboesch]

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).

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)

Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c	Mon Jan 31 11:06:29 2011	(r32836)
+++ trunk/libvo/vo_vdpau.c	Mon Jan 31 16:45:46 2011	(r32837)
@@ -18,11 +18,6 @@
  * You should have received a copy of the GNU General Public License along
  * with MPlayer; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * You can alternatively redistribute this file 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.
  */
 
 /**