# HG changeset patch
# User diego
# Date 1205513173 0
# Node ID 0d255d03016f7ce94eb1e7fc25fd8200393cecc8
# Parent  4ceba0834c89e0a251d8a039dc9c30432e8181e7
#include config.h before all other headers.

diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/gtk/about.c
--- a/gui/mplayer/gtk/about.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/gtk/about.c	Fri Mar 14 16:46:13 2008 +0000
@@ -1,6 +1,5 @@
-
+#include "config.h"
 #include "app.h"
-#include "config.h"
 #include "help_mp.h"
 
 #include "mplayer/pixmaps/about.xpm"
diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/gtk/eq.c
--- a/gui/mplayer/gtk/eq.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/gtk/eq.c	Fri Mar 14 16:46:13 2008 +0000
@@ -9,9 +9,9 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#include "config.h"
 #include "app.h"
 #include "cfg.h"
-#include "config.h"
 #include "help_mp.h"
 #include "libaf/equalizer.h"
 #include "libvo/video_out.h"
diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/gtk/fs.c
--- a/gui/mplayer/gtk/fs.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/gtk/fs.c	Fri Mar 14 16:46:13 2008 +0000
@@ -6,6 +6,7 @@
 #include <glob.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "../gmplayer.h"
 
 #include "mplayer/pixmaps/up.xpm"
@@ -14,7 +15,6 @@
 
 #include "app.h"
 #include "interface.h"
-#include "config.h"
 #include "help_mp.h"
 #include "stream/stream.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/gtk/mb.c
--- a/gui/mplayer/gtk/mb.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/gtk/mb.c	Fri Mar 14 16:46:13 2008 +0000
@@ -1,6 +1,5 @@
-
+#include "config.h"
 #include "app.h"
-#include "config.h"
 #include "help_mp.h"
 
 #include "../pixmaps/error.xpm"
diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/gtk/sb.c
--- a/gui/mplayer/gtk/sb.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/gtk/sb.c	Fri Mar 14 16:46:13 2008 +0000
@@ -6,11 +6,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "config.h"
 #include "sb.h"
 #include "gtk_common.h"
 
 #include "app.h"
-#include "config.h"
 #include "help_mp.h"
 
 #include "../widgets.h"
diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/menu.c
--- a/gui/mplayer/menu.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/menu.c	Fri Mar 14 16:46:13 2008 +0000
@@ -3,9 +3,9 @@
 #include <stdio.h>
 #include <inttypes.h>
 
+#include "../config.h"
 #include "app.h"
 #include "gmplayer.h"
-#include "../config.h"
 #include "../help_mp.h"
 #include "../mp_msg.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/mw.c
--- a/gui/mplayer/mw.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/mw.c	Fri Mar 14 16:46:13 2008 +0000
@@ -8,13 +8,13 @@
 #include <unistd.h>
 #include <string.h>
 
+#include "../config.h"
 #include "gmplayer.h"
 #include "app.h"
 #include "skin/font.h"
 #include "skin/skin.h"
 #include "wm/ws.h"
 
-#include "../config.h"
 #include "../help_mp.h"
 #include "../libvo/x11_common.h"
 #include "../libvo/fastmemcpy.h"
diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/pb.c
--- a/gui/mplayer/pb.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/pb.c	Fri Mar 14 16:46:13 2008 +0000
@@ -8,12 +8,12 @@
 #include <unistd.h>
 #include <string.h>
 
+#include "../config.h"
 #include "app.h"
 #include "skin/font.h"
 #include "skin/skin.h"
 #include "wm/ws.h"
 
-#include "../config.h"
 #include "../help_mp.h"
 #include "../libvo/x11_common.h"
 #include "../libvo/fastmemcpy.h"
diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/play.c
--- a/gui/mplayer/play.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/play.c	Fri Mar 14 16:46:13 2008 +0000
@@ -7,9 +7,9 @@
 #include <unistd.h>
 #include <signal.h>
 
+#include "../config.h"
 #include "wm/ws.h"
 #include "wm/wsxdnd.h"
-#include "../config.h"
 #include "../help_mp.h"
 #include "../libvo/x11_common.h"
 #include "../libvo/video_out.h"
diff -r 4ceba0834c89 -r 0d255d03016f gui/mplayer/widgets.c
--- a/gui/mplayer/widgets.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/gui/mplayer/widgets.c	Fri Mar 14 16:46:13 2008 +0000
@@ -15,6 +15,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+#include "../config.h"
 #include "widgets.h"
 #include "app.h"
 #include "wm/ws.h"
@@ -24,7 +25,6 @@
 #include "play.h"
 #include "gtk/fs.h"
 
-#include "../config.h"
 #include "../help_mp.h"
 #include "../mp_msg.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f libaf/af.h
--- a/libaf/af.h	Fri Mar 14 12:21:57 2008 +0000
+++ b/libaf/af.h	Fri Mar 14 16:46:13 2008 +0000
@@ -3,8 +3,8 @@
 
 #include <stdio.h>
 
+#include "config.h"
 #include "af_mp.h"
-#include "config.h"
 #include "control.h"
 #include "af_format.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f libmpcodecs/ae_lavc.c
--- a/libmpcodecs/ae_lavc.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/libmpcodecs/ae_lavc.c	Fri Mar 14 16:46:13 2008 +0000
@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
+#include "config.h"
 #include "m_option.h"
 #include "mp_msg.h"
 #include "libmpdemux/aviheader.h"
@@ -12,7 +13,6 @@
 #include "libmpdemux/muxer.h"
 #include "ae_lavc.h"
 #include "help_mp.h"
-#include "config.h"
 #include "libaf/af_format.h"
 #include "libaf/reorder_ch.h"
 #include "libavcodec/avcodec.h"
diff -r 4ceba0834c89 -r 0d255d03016f libmpcodecs/pullup.c
--- a/libmpcodecs/pullup.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/libmpcodecs/pullup.c	Fri Mar 14 16:46:13 2008 +0000
@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "pullup.h"
-#include "config.h"
 #include "cpudetect.h"
 
 
diff -r 4ceba0834c89 -r 0d255d03016f libvo/gl_common.h
--- a/libvo/gl_common.h	Fri Mar 14 12:21:57 2008 +0000
+++ b/libvo/gl_common.h	Fri Mar 14 16:46:13 2008 +0000
@@ -4,8 +4,8 @@
 #include <stdio.h>
 #include <stdint.h>
 
+#include "config.h"
 #include "mp_msg.h"
-#include "config.h"
 
 #include <GL/gl.h>
 #include "video_out.h"
diff -r 4ceba0834c89 -r 0d255d03016f libvo/vo_png.c
--- a/libvo/vo_png.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/libvo/vo_png.c	Fri Mar 14 16:46:13 2008 +0000
@@ -14,8 +14,8 @@
 
 #include <png.h>
 
+#include "config.h"
 #include "mp_msg.h"
-#include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "video_out.h"
diff -r 4ceba0834c89 -r 0d255d03016f libvo/vo_sdl.c
--- a/libvo/vo_sdl.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/libvo/vo_sdl.c	Fri Mar 14 16:46:13 2008 +0000
@@ -58,8 +58,8 @@
 #include <string.h>
 #include <inttypes.h>
 
+#include "config.h"
 #include "mp_msg.h"
-#include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "video_out.h"
diff -r 4ceba0834c89 -r 0d255d03016f libvo/vo_zr.c
--- a/libvo/vo_zr.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/libvo/vo_zr.c	Fri Mar 14 16:46:13 2008 +0000
@@ -18,10 +18,8 @@
 #include <sys/ioctl.h>
 #include <linux/types.h>
 #include <linux/videodev.h>
+#include "config.h"
 #include "videodev_mjpeg.h"
-
-#include "config.h"
-
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "mp_msg.h"
diff -r 4ceba0834c89 -r 0d255d03016f libvo/vo_zr2.c
--- a/libvo/vo_zr2.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/libvo/vo_zr2.c	Fri Mar 14 16:46:13 2008 +0000
@@ -19,10 +19,8 @@
 #include <sys/ioctl.h>
 #include <linux/types.h>
 #include <linux/videodev.h>
+#include "config.h"
 #include "videodev_mjpeg.h"
-
-#include "config.h"
-
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "mp_msg.h"
diff -r 4ceba0834c89 -r 0d255d03016f mp3lib/test.c
--- a/mp3lib/test.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/mp3lib/test.c	Fri Mar 14 16:46:13 2008 +0000
@@ -9,9 +9,8 @@
 #include <unistd.h>
 #include <sys/time.h>
 
+#include "config.h"
 #include "mp3lib/mp3.h"
-#include "config.h"
-
 #include "cpudetect.h"
 extern CpuCaps gCpuCaps;
 
diff -r 4ceba0834c89 -r 0d255d03016f mp3lib/test2.c
--- a/mp3lib/test2.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/mp3lib/test2.c	Fri Mar 14 16:46:13 2008 +0000
@@ -9,8 +9,8 @@
 #include <unistd.h>
 #include <sys/soundcard.h>
 
+#include "config.h"
 #include "mp3lib/mp3.h"
-#include "config.h"
 #include "cpudetect.h"
 
 static FILE* mp3file=NULL;
diff -r 4ceba0834c89 -r 0d255d03016f mpbswap.h
--- a/mpbswap.h	Fri Mar 14 12:21:57 2008 +0000
+++ b/mpbswap.h	Fri Mar 14 16:46:13 2008 +0000
@@ -2,8 +2,8 @@
 #define MPLAYER_MPBSWAP_H
 
 #include <sys/types.h>
+#include "config.h"
 #include "libavutil/bswap.h"
-#include "config.h"
 
 #ifndef HAVE_SWAB
 void swab(const void *from, void *to, ssize_t n);
diff -r 4ceba0834c89 -r 0d255d03016f vidix/cyberblade_vid.c
--- a/vidix/cyberblade_vid.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/vidix/cyberblade_vid.c	Fri Mar 14 16:46:13 2008 +0000
@@ -43,13 +43,13 @@
 #include <inttypes.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
 #include "pci_names.h"
-#include "config.h"
 
 #include "cyberblade_regs.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f vidix/drivers.c
--- a/vidix/drivers.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/vidix/drivers.c	Fri Mar 14 16:46:13 2008 +0000
@@ -24,8 +24,8 @@
 #include <errno.h>
 #include <string.h>
 
+#include "config.h"
 #include "vidixlib.h"
-#include "config.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"
 #include "config.h"
diff -r 4ceba0834c89 -r 0d255d03016f vidix/nvidia_vid.c
--- a/vidix/nvidia_vid.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/vidix/nvidia_vid.c	Fri Mar 14 16:46:13 2008 +0000
@@ -31,13 +31,13 @@
 #include <unistd.h>
 
 
+#include "config.h"
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
 #include "pci_names.h"
-#include "config.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f vidix/pm2_vid.c
--- a/vidix/pm2_vid.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/vidix/pm2_vid.c	Fri Mar 14 16:46:13 2008 +0000
@@ -27,13 +27,13 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
 #include "pci_names.h"
-#include "config.h"
 
 #include "glint_regs.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f vidix/pm3_vid.c
--- a/vidix/pm3_vid.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/vidix/pm3_vid.c	Fri Mar 14 16:46:13 2008 +0000
@@ -26,13 +26,13 @@
 #include <inttypes.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
 #include "pci_names.h"
-#include "config.h"
 
 #include "pm3_regs.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f vidix/s3_vid.c
--- a/vidix/s3_vid.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/vidix/s3_vid.c	Fri Mar 14 16:46:13 2008 +0000
@@ -32,13 +32,13 @@
 #include <unistd.h>
 #include <math.h>
 
+#include "config.h"
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
 #include "pci_names.h"
-#include "config.h"
 
 #include "s3_regs.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f vidix/sis_vid.c
--- a/vidix/sis_vid.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/vidix/sis_vid.c	Fri Mar 14 16:46:13 2008 +0000
@@ -30,13 +30,13 @@
 #include <inttypes.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
 #include "pci_names.h"
-#include "config.h"
 
 #include "sis_regs.h"
 #include "sis_defs.h"
diff -r 4ceba0834c89 -r 0d255d03016f vidix/unichrome_vid.c
--- a/vidix/unichrome_vid.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/vidix/unichrome_vid.c	Fri Mar 14 16:46:13 2008 +0000
@@ -36,13 +36,13 @@
 #include <inttypes.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
 #include "pci_names.h"
-#include "config.h"
 
 #include "unichrome_regs.h"
 
diff -r 4ceba0834c89 -r 0d255d03016f vidix/vidixlib.c
--- a/vidix/vidixlib.c	Fri Mar 14 12:21:57 2008 +0000
+++ b/vidix/vidixlib.c	Fri Mar 14 16:46:13 2008 +0000
@@ -37,9 +37,9 @@
 #include <errno.h>
 #include <string.h>
 
+#include "config.h"
 #include "vidixlib.h"
 #include "drivers.h"
-#include "config.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"