summaryrefslogtreecommitdiffstats
path: root/ext/musepack
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-01-26 14:35:22 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-01-26 14:35:22 +0000
commit82dc68af4807b931ca9a320d99add4e6a943aa31 (patch)
tree1c3ebdc02df491469296dfd64405b060a0b224e0 /ext/musepack
parent23a2e7d7adad5ce71446e83134f0c84aba5393e8 (diff)
downloadgst-plugins-bad-82dc68af4807b931ca9a320d99add4e6a943aa31.tar.gz
gst-plugins-bad-82dc68af4807b931ca9a320d99add4e6a943aa31.tar.bz2
gst-plugins-bad-82dc68af4807b931ca9a320d99add4e6a943aa31.zip
ext/musepack/: First include the libmpcdec headers before everything else as they #define TRUE and FALSE unconditiona...
Original commit message from CVS: * ext/musepack/gstmusepackdec.h: * ext/musepack/gstmusepackreader.c: First include the libmpcdec headers before everything else as they #define TRUE and FALSE unconditionally and we otherwise get conflicts with the ones that GLib defines.
Diffstat (limited to 'ext/musepack')
-rw-r--r--ext/musepack/gstmusepackdec.h2
-rw-r--r--ext/musepack/gstmusepackreader.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/musepack/gstmusepackdec.h b/ext/musepack/gstmusepackdec.h
index 35baced0..858372fd 100644
--- a/ext/musepack/gstmusepackdec.h
+++ b/ext/musepack/gstmusepackdec.h
@@ -20,8 +20,8 @@
#ifndef __GST_MUSEPACK_DEC_H__
#define __GST_MUSEPACK_DEC_H__
-#include <gst/gst.h>
#include <mpcdec/mpcdec.h>
+#include <gst/gst.h>
G_BEGIN_DECLS
diff --git a/ext/musepack/gstmusepackreader.c b/ext/musepack/gstmusepackreader.c
index d98f48f6..10de6b0d 100644
--- a/ext/musepack/gstmusepackreader.c
+++ b/ext/musepack/gstmusepackreader.c
@@ -21,10 +21,10 @@
#include "config.h"
#endif
+#include "gstmusepackreader.h"
#include <gst/gst.h>
#include <string.h>
-#include "gstmusepackreader.h"
GST_DEBUG_CATEGORY_EXTERN (musepackdec_debug);
#define GST_CAT_DEFAULT musepackdec_debug