# HG changeset patch # User diego # Date 1284306671 0 # Node ID 20bc9bdd7aa1a3bb4714a90afe124430e75a80b2 # Parent e2a7509972d4b81816ffd473c7d8aa1488f1318d Skip #ifdefs around harmless ae_*.h header #includes. diff -r e2a7509972d4 -r 20bc9bdd7aa1 libmpcodecs/ae.c --- 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) {