From: <tp...@ke...> - 2006-07-26 10:12:50
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: tpm Date: Wed Jul 26 2006 09:03:08 UTC Log message: * gst/wavparse/gstwavparse.c: #define 'fact' RIFF chunk if we are not compiling against -base CVS (we don't want to depend on -base CVS for this one define only, and also not for release order reasons). Modified files: . : ChangeLog gst/wavparse : gstwavparse.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2456&r2=1.2457 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/wavparse/gstwavparse.c.diff?r1=1.125&r2=1.126 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2456 retrieving revision 1.2457 diff -u -d -r1.2456 -r1.2457 --- ChangeLog 26 Jul 2006 08:17:45 -0000 1.2456 +++ ChangeLog 26 Jul 2006 09:02:56 -0000 1.2457 @@ -1,5 +1,12 @@ 2006-07-26 Tim-Philipp Müller <tim at centricular dot net> + * gst/wavparse/gstwavparse.c: + #define 'fact' RIFF chunk if we are not compiling against + -base CVS (we don't want to depend on -base CVS for this + one define only, and also not for release order reasons). + +2006-07-26 Tim-Philipp Müller <tim at centricular dot net> * ext/taglib/gstid3v2mux.cc: Handle multiple tags of the same type properly. Re-inject unparsed ID3v2 frames that we get as binary blobs from Index: gstwavparse.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/wavparse/gstwavparse.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- gstwavparse.c 24 Jul 2006 13:40:56 -0000 1.125 +++ gstwavparse.c 26 Jul 2006 09:02:56 -0000 1.126 @@ -60,8 +60,9 @@ #include "gst/riff/riff-media.h" #include <gst/gst-i18n-plugin.h> -#ifndef G_MAXUINT32 -#define G_MAXUINT32 0xffffffff +/* FIXME: remove again when we depend on -base >= 0.10.9.1 */ +#ifndef GST_RIFF_TAG_fact +#define GST_RIFF_TAG_fact GST_MAKE_FOURCC ('f','a','c','t') #endif GST_DEBUG_CATEGORY_STATIC (wavparse_debug); |