# HG changeset patch # User diego # Date 1210146575 0 # Node ID bd0554dbc8e535565f863e830584e4588f4a30c7 # Parent f467dcaeeb260d95378d90aced24a12d9df5f9f5 Relicense file as GPL v2+; bero granted permission on IRC. diff -r f467dcaeeb26 -r bd0554dbc8e5 libmpcodecs/ve_x264.c --- a/libmpcodecs/ve_x264.c Tue May 06 22:56:42 2008 +0000 +++ b/libmpcodecs/ve_x264.c Wed May 07 07:49:35 2008 +0000 @@ -7,21 +7,21 @@ * * Written by Bernhard Rosenkraenzer * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation, or if, and only if, - * version 2 is ruled invalid in a court of law, any later version - * of the GNU General Public License published by the Free Software - * Foundation. + * This file is part of MPlayer. * - * This program is distributed in the hope that it will be useful, + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTIBILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * 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. * *****************************************************************************/