Mercurial > mplayer.hg

changeset 32120:20bc9bdd7aa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Skip #ifdefs around harmless ae_*.h header #includes.
author diego
date Sun, 12 Sep 2010 15:51:11 +0000
parents e2a7509972d4
children d332ea379205
files libmpcodecs/ae.c
diffstat 1 files changed, 6 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ae.c	Sun Sep 12 15:48:46 2010 +0000
+++ b/libmpcodecs/ae.c	Sun Sep 12 15:51:11 2010 +0000
@@ -28,29 +28,14 @@
 #include "libmpdemux/ms_hdr.h"
 #include "stream/stream.h"
 #include "libmpdemux/muxer.h"
+#include "ae_faac.h"
+#include "ae_lame.h"
+#include "ae_lavc.h"
+#include "ae_pcm.h"
+#include "ae_toolame.h"
+#include "ae_twolame.h"
 #include "ae.h"
 
-#include "ae_pcm.h"
-
-#ifdef CONFIG_TOOLAME
-#include "ae_toolame.h"
-#endif
-
-#ifdef CONFIG_MP3LAME
-#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_twolame.h"
-#endif
 
 audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params)
 {