[MPlayer-cvslog] r32204 - trunk/libmpcodecs/ae.c

[diego]

Author: diego
Date: Sun Sep 12 17:51:11 2010
New Revision: 32204

Log:
Skip #ifdefs around harmless ae_*.h header #includes.

Modified:
   trunk/libmpcodecs/ae.c

Modified: trunk/libmpcodecs/ae.c
==============================================================================
--- trunk/libmpcodecs/ae.c	Sun Sep 12 17:48:46 2010	(r32203)
+++ trunk/libmpcodecs/ae.c	Sun Sep 12 17:51:11 2010	(r32204)
@@ -28,29 +28,14 @@
 #include "libmpdemux/ms_hdr.h"
 #include "stream/stream.h"
 #include "libmpdemux/muxer.h"
-#include "ae.h"
-
-#include "ae_pcm.h"
-
-#ifdef CONFIG_TOOLAME
-#include "ae_toolame.h"
-#endif
-
-#ifdef CONFIG_MP3LAME
+#include "ae_faac.h"
 #include "ae_lame.h"
-#endif
-
-#ifdef CONFIG_LIBAVCODEC
 #include "ae_lavc.h"
-#endif
-
-#ifdef CONFIG_FAAC
-#include "ae_faac.h"
-#endif
-
-#ifdef CONFIG_TWOLAME
+#include "ae_pcm.h"
+#include "ae_toolame.h"
 #include "ae_twolame.h"
-#endif
+#include "ae.h"
+
 
 audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params)
 {