Merge svn changes up to r27092

Conflicts:

	libmpdemux/demuxer.c
	libvo/vo_xv.c
	mencoder.c

8 files changed, 71 insertions, 25 deletions

diff --git a/vidix/dhahelper/dhahelper.c b/vidix/dhahelper/dhahelper.c
index 5d501e94e6..8c1dc27e4f 100644
--- a/vidix/dhahelper/dhahelper.c
+++ b/vidix/dhahelper/dhahelper.c
@@ -1,14 +1,29 @@
 /*
-    Direct Hardware Access kernel helper
-    
-    (C) 2002 Alex Beregszaszi <alex@fsn.hu>
-    
+ * 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
+ * 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.
+ */
+
+/*
     Accessing hardware from userspace as USER (no root needed!)
 
     Tested on 2.2.x (2.2.19) and 2.4.x (2.4.3,2.4.17).
-    
-    License: GPL
-    
+
     WARNING! THIS MODULE VIOLATES SEVERAL SECURITY LINES! DON'T USE IT
     ON PRODUCTION SYSTEMS, ONLY AT HOME, ON A "SINGLE-USER" SYSTEM.
     NO WARRANTY!
diff --git a/vidix/dhahelper/dhahelper.h b/vidix/dhahelper/dhahelper.h
index 1ae57d26c8..588cede54f 100644
--- a/vidix/dhahelper/dhahelper.h
+++ b/vidix/dhahelper/dhahelper.h
@@ -1,8 +1,23 @@
 /*
-    Direct Hardware Access kernel helper
-    
-    (C) 2002 Alex Beregszaszi <alex@fsn.hu>
-*/
+ * 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
+ * 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.
+ */
 
 #ifndef MPLAYER_DHAHELPER_H
 #define MPLAYER_DHAHELPER_H
diff --git a/vidix/dhahelper/test.c b/vidix/dhahelper/test.c
index 8e795f77df..78f8250d99 100644
--- a/vidix/dhahelper/test.c
+++ b/vidix/dhahelper/test.c
@@ -1,3 +1,25 @@
+/*
+ * dhahelper test program
+ *
+ * Copyright (C) 2002 Alex Beregszsaszi
+ *
+ * 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 <string.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
diff --git a/vidix/pci.c b/vidix/pci.c
index a68eae7e32..1d0cc5aa01 100644
--- a/vidix/pci.c
+++ b/vidix/pci.c
@@ -159,7 +159,7 @@ int pciconfig_write(
 	}
 	return PCIBIOS_SUCCESSFUL;
 }
-#endif
+#endif /* defined(Lynx) && defined(__powerpc__) */
  
 #if !defined(__powerpc__)
 struct pci_config_reg {
@@ -437,7 +437,7 @@ struct pci_config_reg {
     unsigned short _configtype;   /* config type found                   */
     unsigned long _cardnum;       /* config type 2 - private card number */
 };
-#endif
+#endif /* !defined(__powerpc__) */
 
 #define MAX_DEV_PER_VENDOR_CFG1 64
 #define MAX_PCI_DEVICES_PER_BUS 32
@@ -489,7 +489,7 @@ static int pcibus=-1, pcicard=-1, pcifunc=-1 ;
 #else
 #include "sysdep/pci_x86.c"
 #endif
-#endif
+#endif /*CONFIG_SVGAHELPER */
  
 static pciinfo_t *pci_lst;
  
diff --git a/vidix/sysdep/AsmMacros_x86.h b/vidix/sysdep/AsmMacros_x86.h
index 47ebe8bd1c..c0b1afc105 100644
--- a/vidix/sysdep/AsmMacros_x86.h
+++ b/vidix/sysdep/AsmMacros_x86.h
@@ -62,15 +62,11 @@
 #ifndef MPLAYER_ASMMACROS_X86_H
 #define MPLAYER_ASMMACROS_X86_H
 
-//#if defined (WINNT)
-//#error This stuff is not ported on your system
-//#else
-
 #include "config.h"
 
 #ifdef CONFIG_DHAHELPER
 #include <sys/ioctl.h>
-#include "dhahelper/dhahelper.h"
+#include "vidix/dhahelper/dhahelper.h"
 
 extern int dhahelper_fd;
 extern int dhahelper_initialized;
@@ -343,6 +339,4 @@ static __inline__ void intr_enable()
   __asm__ __volatile__("sti");
 }
 
-//#endif
-
 #endif /* MPLAYER_ASMMACROS_X86_H */
diff --git a/vidix/sysdep/libdha_win32.c b/vidix/sysdep/libdha_win32.c
index c20727e50a..ba3bacb5aa 100644
--- a/vidix/sysdep/libdha_win32.c
+++ b/vidix/sysdep/libdha_win32.c
@@ -6,7 +6,7 @@
 
 #include <windows.h>
 #include <ddk/ntddk.h>
-#include "dhahelperwin/dhahelper.h"
+#include "vidix/dhahelperwin/dhahelper.h"
 
 /*
   This is the request structure that applications use
diff --git a/vidix/sysdep/pci_linux.c b/vidix/sysdep/pci_linux.c
index a4eb3ebdde..aca99573db 100644
--- a/vidix/sysdep/pci_linux.c
+++ b/vidix/sysdep/pci_linux.c
@@ -86,7 +86,7 @@ static int pci_get_vendor(
 {
     return pci_config_read_long(bus, dev, func, 0);
 }
-#endif
+#endif /* CONFIG_SVGAHELPER */
 
 static __inline__ int enable_os_io(void)
 {
@@ -210,4 +210,4 @@ static long pci_config_read_long(
     }
     return retval;
 }
-#endif
+#endif /* defined(CONFIG_PCI_LINUX_PROC) */
diff --git a/vidix/sysdep/pci_win32.c b/vidix/sysdep/pci_win32.c
index 41f8a4eb90..ffa4d2238f 100644
--- a/vidix/sysdep/pci_win32.c
+++ b/vidix/sysdep/pci_win32.c
@@ -28,7 +28,7 @@
 
 #include <windows.h>
 #include <ddk/ntddk.h>
-#include "dhahelperwin/dhahelper.h"
+#include "vidix/dhahelperwin/dhahelper.h"
 
 static HANDLE hDriver;
 extern int IsWinNT();