diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-31 19:43:58 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-31 19:43:58 +0200 |
| commit | c043cbe458de70acbdb12afb97c20c6a00d416dd (patch) | |
| tree | fa8dc974b059070b73906dac3ad52a328139e28a /src/libxineadec/xine_mad_decoder.c | |
| parent | 8af2e39ae55ae46ac57c676439383123cae11e13 (diff) | |
| parent | c6c900ac497ccb751bb35c9f913ad62395003f74 (diff) | |
| download | xine-lib-c043cbe458de70acbdb12afb97c20c6a00d416dd.tar.gz xine-lib-c043cbe458de70acbdb12afb97c20c6a00d416dd.tar.bz2 | |
Merge from 1.1 branch.
--HG--
rename : src/libmad/xine_mad_decoder.c => src/libxineadec/xine_mad_decoder.c
Diffstat (limited to 'src/libxineadec/xine_mad_decoder.c')
| -rw-r--r-- | src/libxineadec/xine_mad_decoder.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c index 28407cfec..98695db68 100644 --- a/src/libxineadec/xine_mad_decoder.c +++ b/src/libxineadec/xine_mad_decoder.c @@ -39,10 +39,15 @@ #include "xine_internal.h" #include "audio_out.h" #include "buffer.h" -#include "frame.h" -#include "synth.h" #include "xineutils.h" +#ifdef HAVE_MAD_H +# include <mad.h> +#else +# include "frame.h" +# include "synth.h" +#endif + #define INPUT_BUF_SIZE 16384 typedef struct { |