diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
commit | b0986b3760b0174be6a58e1754353102f3230c79 (patch) | |
tree | 0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /vidix | |
parent | 5fc54a6caad5f24b993da2e282c896269a6abc49 (diff) | |
parent | 23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff) | |
download | mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2 mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz |
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'vidix')
-rw-r--r-- | vidix/dhahelper/dhahelper.c | 1 | ||||
-rw-r--r-- | vidix/dhahelper/dhahelper.h | 1 | ||||
-rw-r--r-- | vidix/dhahelperwin/dhahelper.rc | 52 | ||||
-rw-r--r-- | vidix/sysdep/libdha_win32.c | 24 |
4 files changed, 57 insertions, 21 deletions
diff --git a/vidix/dhahelper/dhahelper.c b/vidix/dhahelper/dhahelper.c index 498f6537e6..a187388ef3 100644 --- a/vidix/dhahelper/dhahelper.c +++ b/vidix/dhahelper/dhahelper.c @@ -2,6 +2,7 @@ * Direct Hardware Access (DHA) kernel helper * * Copyright (C) 2002 Alex Beregszaszi <alex@fsn.hu> + * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify diff --git a/vidix/dhahelper/dhahelper.h b/vidix/dhahelper/dhahelper.h index 588cede54f..f7c5fa13c1 100644 --- a/vidix/dhahelper/dhahelper.h +++ b/vidix/dhahelper/dhahelper.h @@ -2,6 +2,7 @@ * Direct Hardware Access (DHA) kernel helper * * Copyright (C) 2002 Alex Beregszaszi <alex@fsn.hu> + * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify diff --git a/vidix/dhahelperwin/dhahelper.rc b/vidix/dhahelperwin/dhahelper.rc index 3f878a5fd9..1869a57a4e 100644 --- a/vidix/dhahelperwin/dhahelper.rc +++ b/vidix/dhahelperwin/dhahelper.rc @@ -1,17 +1,35 @@ -#include <windows.h>
-
-#include <ntverp.h>
-
-#undef VER_COMPANYNAME_STR
-#undef VER_PRODUCTNAME_STR
-
-#define VER_FILETYPE VFT_DRV
-#define VER_FILESUBTYPE VFT2_DRV_SYSTEM
-#define VER_FILEDESCRIPTION_STR "DhaHelper - Direct HardWare Access Driver"
-#define VER_INTERNALNAME_STR "DhaHelper.sys"
-#define VER_ORIGINALFILENAME_STR "DhaHelper.sys"
-#define VER_LEGALCOPYRIGHT_STR "Sascha Sommer"
-#define VER_COMPANYNAME_STR "MPlayer <http://svn.mplayerhq.hu/mplayer/trunk/vidix/dhahelperwin/>"
-#define VER_PRODUCTNAME_STR "DhaHelper Driver V1.0"
-
-#include "common.ver"
+/* + * 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. + */ + +#include <windows.h> + +#include <ntverp.h> + +#undef VER_COMPANYNAME_STR +#undef VER_PRODUCTNAME_STR + +#define VER_FILETYPE VFT_DRV +#define VER_FILESUBTYPE VFT2_DRV_SYSTEM +#define VER_FILEDESCRIPTION_STR "DhaHelper - Direct HardWare Access Driver" +#define VER_INTERNALNAME_STR "DhaHelper.sys" +#define VER_ORIGINALFILENAME_STR "DhaHelper.sys" +#define VER_LEGALCOPYRIGHT_STR "Sascha Sommer" +#define VER_COMPANYNAME_STR "MPlayer <http://svn.mplayerhq.hu/mplayer/trunk/vidix/dhahelperwin/>" +#define VER_PRODUCTNAME_STR "DhaHelper Driver V1.0" + +#include "common.ver" diff --git a/vidix/sysdep/libdha_win32.c b/vidix/sysdep/libdha_win32.c index d6ecdae014..f3c287f92f 100644 --- a/vidix/sysdep/libdha_win32.c +++ b/vidix/sysdep/libdha_win32.c @@ -1,8 +1,24 @@ /* - MAPDEV.h - include file for VxD MAPDEV - Copyright (c) 1996 Vireo Software, Inc. - Modified for libdha by Nick Kurshev. -*/ + * MAPDEV.h - include file for VxD MAPDEV + * Copyright (c) 1996 Vireo Software, Inc. + * Modified for libdha by Nick Kurshev. + * + * 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. + */ #include <windows.h> #include <ddk/ntddk.h> |