diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-11 10:09:16 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-11 10:09:16 +0200 |
| commit | aaa87d78d6e8fe7b1ddaa910f2657952f117529f (patch) | |
| tree | df7f07d70fa3f6b25998918bbc476b2b68b73101 /src/libmusepack/xine_musepack_decoder.c | |
| parent | 3325b9aa2a719ae200b18b8f44f0b2452c27d49d (diff) | |
| download | xine-lib-aaa87d78d6e8fe7b1ddaa910f2657952f117529f.tar.gz xine-lib-aaa87d78d6e8fe7b1ddaa910f2657952f117529f.tar.bz2 | |
Update libmpcdec (formerly libmusepack) to version 1.2.5, this also reduces the patching needed.
Contestually, move libmpcdec code in contrib/libmpcdec, so that it's not mixed together with xine code.
The use of MUSEPACK_LIBS/MUSEPACK_CFLAGS intermediate is to make simpler move to pkg-config checks if libmpcdec developers decide to install one.
Diffstat (limited to 'src/libmusepack/xine_musepack_decoder.c')
| -rw-r--r-- | src/libmusepack/xine_musepack_decoder.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libmusepack/xine_musepack_decoder.c b/src/libmusepack/xine_musepack_decoder.c index 26c2eddf5..4397f65e3 100644 --- a/src/libmusepack/xine_musepack_decoder.c +++ b/src/libmusepack/xine_musepack_decoder.c @@ -43,11 +43,7 @@ #include "buffer.h" #include "xineutils.h" -#ifdef HAVE_MPCDEC_MPCDEC_H -# include <mpcdec/mpcdec.h> -#else -# include "musepack/musepack.h" -#endif +#include <mpcdec/mpcdec.h> #define MPC_DECODER_MEMSIZE 65536 #define MPC_DECODER_MEMSIZE2 (MPC_DECODER_MEMSIZE/2) |