[MPlayer-dev-eng] Direct3D OSD discussion

[Jim Hauxwell]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Diego Biurrun wrote:
> On Wed, Nov 26, 2008 at 12:26:37AM +0000, Jim Hauxwell wrote:
>> --- libvo/vo_direct3d.c	(revision 28034)
>> +++ libvo/vo_direct3d.c	(working copy)
>> @@ -1,668 +1,895 @@
>> -/*
>> - * Copyright (c) 2008 Georgi Petrov (gogothebee) <gogothebee at gmail.com>
>> - *
>> - * This file is part of MPlayer.
>> - *
>> - * 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
>> - * 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
>> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>> - */
>> +/*
>> + * Copyright (c) 2008 Georgi Petrov (gogothebee) <gogothebee at gmail.com>
>> + *
>> + * This file is part of MPlayer.
>> + *
>> + * 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
>> + * 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
>> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>> + */
> 
> This patch is broken and does not apply.  I suspect Windows linebreaks.
> 
> Diego


Sorry, my mistake.  Visual Studio had decided to add CR/LF to all the
lines and svn diff doesn't take this into account.

New, smaller patch file

Jim


> _______________________________________________
> MPlayer-dev-eng mailing list
> MPlayer-dev-eng at mplayerhq.hu
> https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng
> 
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkktASIACgkQhrNWoHjgI1DZ7gCdHXix/HtFzJTbJlJchE7EY6ml
J00AnjSskO/BoWsHCtxx9eiScK5/qAKX
=A++o
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: diff8.diff
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20081126/e14b6c40/attachment.asc>