[MPlayer-cvslog] r31507 - trunk/cfg-common.h

[diego]

Author: diego
Date: Mon Jun 21 12:20:17 2010
New Revision: 31507

Log:
Reorder #includes and drop an unnecessary set of #ifdefs.

Modified:
   trunk/cfg-common.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Mon Jun 21 12:19:01 2010	(r31506)
+++ trunk/cfg-common.h	Mon Jun 21 12:20:17 2010	(r31507)
@@ -20,10 +20,6 @@
 #define MPLAYER_CFG_COMMON_H
 
 #include <sys/types.h>
-#include "config.h"
-#include "m_config.h"
-#include "m_option.h"
-#include "mp_msg.h"
 
 #include "libmpcodecs/ad.h"
 #include "libmpcodecs/dec_audio.h"
@@ -38,21 +34,21 @@
 #include "libmpdemux/mf.h"
 #include "libpostproc/postprocess.h"
 #include "osdep/priority.h"
+#include "stream/cdd.h"
 #include "stream/network.h"
 #include "stream/pvr.h"
 #include "stream/stream_dvd_common.h"
+#include "stream/stream_radio.h"
 #include "stream/tcp.h"
+#include "stream/tv.h"
 #include "stream/udp.h"
 #include "codec-cfg.h"
+#include "config.h"
+#include "m_config.h"
+#include "m_option.h"
+#include "mp_msg.h"
 #include "mpcommon.h"
 
-#ifdef CONFIG_CDDA
-#include "stream/cdd.h"
-#endif
-
-#include "stream/tv.h"
-#include "stream/stream_radio.h"
-
 
 
 #ifdef CONFIG_RADIO