From: <sl...@ke...> - 2008-01-26 14:35:30
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: slomo Date: Sat Jan 26 2008 14:35:36 UTC Log message: * 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. Modified files: . : ChangeLog ext/musepack : gstmusepackdec.h gstmusepackreader.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3060&r2=1.3061 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/musepack/gstmusepackdec.h.diff?r1=1.7&r2=1.8 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/musepack/gstmusepackreader.c.diff?r1=1.7&r2=1.8 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.3060 retrieving revision 1.3061 diff -u -d -r1.3060 -r1.3061 --- ChangeLog 26 Jan 2008 13:24:15 -0000 1.3060 +++ ChangeLog 26 Jan 2008 14:35:21 -0000 1.3061 @@ -1,5 +1,13 @@ 2008-01-26 Sebastian Dröge <sl...@ci...> + * 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. + +2008-01-26 Sebastian Dröge <sl...@ci...> * configure.ac: * ext/soundtouch/gstpitch.cc: Add support for libsoundtouch 1.3.1 and add an ugly workaround for Index: gstmusepackdec.h RCS file: /cvs/gstreamer/gst-plugins-bad/ext/musepack/gstmusepackdec.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gstmusepackdec.h 6 Mar 2006 13:15:04 -0000 1.7 +++ gstmusepackdec.h 26 Jan 2008 14:35:22 -0000 1.8 @@ -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 Index: gstmusepackreader.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/musepack/gstmusepackreader.c,v --- gstmusepackreader.c 6 Mar 2006 13:15:04 -0000 1.7 +++ gstmusepackreader.c 26 Jan 2008 14:35:22 -0000 1.8 @@ -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 |