diff --git a/gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c index 47a2b993df..5ae73d806a 100644 --- a/gui/mplayer/gtk/about.c +++ b/gui/mplayer/gtk/about.c @@ -1,6 +1,5 @@ - -#include "app.h" #include "config.h" +#include "app.h" #include "help_mp.h" #include "mplayer/pixmaps/about.xpm" diff --git a/gui/mplayer/gtk/eq.c b/gui/mplayer/gtk/eq.c index 57901e86d0..48279534d8 100644 --- a/gui/mplayer/gtk/eq.c +++ b/gui/mplayer/gtk/eq.c @@ -9,9 +9,9 @@ #include #include +#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 --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c index 437b0d9efa..0cbffbe46a 100644 --- a/gui/mplayer/gtk/fs.c +++ b/gui/mplayer/gtk/fs.c @@ -6,6 +6,7 @@ #include #include +#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 --git a/gui/mplayer/gtk/mb.c b/gui/mplayer/gtk/mb.c index db2ec24749..3938830ea8 100644 --- a/gui/mplayer/gtk/mb.c +++ b/gui/mplayer/gtk/mb.c @@ -1,6 +1,5 @@ - -#include "app.h" #include "config.h" +#include "app.h" #include "help_mp.h" #include "../pixmaps/error.xpm" diff --git a/gui/mplayer/gtk/sb.c b/gui/mplayer/gtk/sb.c index d5e3e4bb20..37c7320309 100644 --- a/gui/mplayer/gtk/sb.c +++ b/gui/mplayer/gtk/sb.c @@ -6,11 +6,11 @@ #include #include +#include "config.h" #include "sb.h" #include "gtk_common.h" #include "app.h" -#include "config.h" #include "help_mp.h" #include "../widgets.h" diff --git a/gui/mplayer/menu.c b/gui/mplayer/menu.c index f6887c4089..a2f966c746 100644 --- a/gui/mplayer/menu.c +++ b/gui/mplayer/menu.c @@ -3,9 +3,9 @@ #include #include +#include "../config.h" #include "app.h" #include "gmplayer.h" -#include "../config.h" #include "../help_mp.h" #include "../mp_msg.h" diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c index f68a9b2b7e..5252117092 100644 --- a/gui/mplayer/mw.c +++ b/gui/mplayer/mw.c @@ -8,13 +8,13 @@ #include #include +#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 --git a/gui/mplayer/pb.c b/gui/mplayer/pb.c index 93e89c3f70..6249618fc2 100644 --- a/gui/mplayer/pb.c +++ b/gui/mplayer/pb.c @@ -8,12 +8,12 @@ #include #include +#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 --git a/gui/mplayer/play.c b/gui/mplayer/play.c index 6a15186a74..c77841a03d 100644 --- a/gui/mplayer/play.c +++ b/gui/mplayer/play.c @@ -7,9 +7,9 @@ #include #include +#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 --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c index 3595966223..834870d5db 100644 --- a/gui/mplayer/widgets.c +++ b/gui/mplayer/widgets.c @@ -15,6 +15,7 @@ #include #include +#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 --git a/libaf/af.h b/libaf/af.h index 879b7c931c..dfa9cfdea5 100644 --- a/libaf/af.h +++ b/libaf/af.h @@ -3,8 +3,8 @@ #include -#include "af_mp.h" #include "config.h" +#include "af_mp.h" #include "control.h" #include "af_format.h" diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index 68c03f4445..a42fbe004d 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -4,6 +4,7 @@ #include #include #include +#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 --git a/libmpcodecs/pullup.c b/libmpcodecs/pullup.c index 04f2106572..b5229052a4 100644 --- a/libmpcodecs/pullup.c +++ b/libmpcodecs/pullup.c @@ -3,8 +3,8 @@ #include #include #include -#include "pullup.h" #include "config.h" +#include "pullup.h" #include "cpudetect.h" diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 69a7e14f53..66fc2fe799 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -4,8 +4,8 @@ #include #include -#include "mp_msg.h" #include "config.h" +#include "mp_msg.h" #include #include "video_out.h" diff --git a/libvo/vo_png.c b/libvo/vo_png.c index 9df2bac68d..791dfd515d 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -14,9 +14,9 @@ #include -#include "mp_msg.h" #include "config.h" #include "mp_msg.h" +#include "mp_msg.h" #include "help_mp.h" #include "video_out.h" #include "video_out_internal.h" diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index b3b73d37e0..b38ee98c40 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -58,9 +58,9 @@ #include #include -#include "mp_msg.h" #include "config.h" #include "mp_msg.h" +#include "mp_msg.h" #include "help_mp.h" #include "video_out.h" #include "video_out_internal.h" diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c index 2bb16bd924..26d868ffd4 100644 --- a/libvo/vo_zr.c +++ b/libvo/vo_zr.c @@ -18,10 +18,8 @@ #include #include #include -#include "videodev_mjpeg.h" - #include "config.h" - +#include "videodev_mjpeg.h" #include "video_out.h" #include "video_out_internal.h" #include "mp_msg.h" diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c index ed03feb371..362ae49860 100644 --- a/libvo/vo_zr2.c +++ b/libvo/vo_zr2.c @@ -19,10 +19,8 @@ #include #include #include -#include "videodev_mjpeg.h" - #include "config.h" - +#include "videodev_mjpeg.h" #include "video_out.h" #include "video_out_internal.h" #include "mp_msg.h" diff --git a/mp3lib/test.c b/mp3lib/test.c index 1a96e9b909..f256224a7d 100644 --- a/mp3lib/test.c +++ b/mp3lib/test.c @@ -9,9 +9,8 @@ #include #include -#include "mp3lib/mp3.h" #include "config.h" - +#include "mp3lib/mp3.h" #include "cpudetect.h" extern CpuCaps gCpuCaps; diff --git a/mp3lib/test2.c b/mp3lib/test2.c index 17c92bf79b..6a20960663 100644 --- a/mp3lib/test2.c +++ b/mp3lib/test2.c @@ -9,8 +9,8 @@ #include #include -#include "mp3lib/mp3.h" #include "config.h" +#include "mp3lib/mp3.h" #include "cpudetect.h" static FILE* mp3file=NULL; diff --git a/mpbswap.h b/mpbswap.h index 70d7d20e30..03ef0c387b 100644 --- a/mpbswap.h +++ b/mpbswap.h @@ -2,8 +2,8 @@ #define MPLAYER_MPBSWAP_H #include -#include "libavutil/bswap.h" #include "config.h" +#include "libavutil/bswap.h" #ifndef HAVE_SWAB void swab(const void *from, void *to, ssize_t n); diff --git a/vidix/cyberblade_vid.c b/vidix/cyberblade_vid.c index 7ba20d819e..7f0a8f3eac 100644 --- a/vidix/cyberblade_vid.c +++ b/vidix/cyberblade_vid.c @@ -43,13 +43,13 @@ #include #include +#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 --git a/vidix/drivers.c b/vidix/drivers.c index c7f1f864bf..6259b6994b 100644 --- a/vidix/drivers.c +++ b/vidix/drivers.c @@ -24,8 +24,8 @@ #include #include -#include "vidixlib.h" #include "config.h" +#include "vidixlib.h" #include "libavutil/common.h" #include "mpbswap.h" #include "config.h" diff --git a/vidix/nvidia_vid.c b/vidix/nvidia_vid.c index bb5ede6615..b10b54f306 100644 --- a/vidix/nvidia_vid.c +++ b/vidix/nvidia_vid.c @@ -31,13 +31,13 @@ #include +#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 --git a/vidix/pm2_vid.c b/vidix/pm2_vid.c index d1f5de0e58..b12bf967d7 100644 --- a/vidix/pm2_vid.c +++ b/vidix/pm2_vid.c @@ -27,13 +27,13 @@ #include #include +#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 --git a/vidix/pm3_vid.c b/vidix/pm3_vid.c index b67e167bbb..a2a3087560 100644 --- a/vidix/pm3_vid.c +++ b/vidix/pm3_vid.c @@ -26,13 +26,13 @@ #include #include +#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 --git a/vidix/s3_vid.c b/vidix/s3_vid.c index cf3501c5a0..332e765483 100644 --- a/vidix/s3_vid.c +++ b/vidix/s3_vid.c @@ -32,13 +32,13 @@ #include #include +#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 --git a/vidix/sis_vid.c b/vidix/sis_vid.c index 37a6e9e081..73fd6f5331 100644 --- a/vidix/sis_vid.c +++ b/vidix/sis_vid.c @@ -30,13 +30,13 @@ #include #include +#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 --git a/vidix/unichrome_vid.c b/vidix/unichrome_vid.c index 70f756bb87..4fb9ddaedc 100644 --- a/vidix/unichrome_vid.c +++ b/vidix/unichrome_vid.c @@ -36,13 +36,13 @@ #include #include +#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 --git a/vidix/vidixlib.c b/vidix/vidixlib.c index 19c9ea3090..ac581f0e1e 100644 --- a/vidix/vidixlib.c +++ b/vidix/vidixlib.c @@ -37,9 +37,9 @@ #include #include +#include "config.h" #include "vidixlib.h" #include "drivers.h" -#include "config.h" #include "libavutil/common.h" #include "mpbswap.h"