diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-07-26 09:02:56 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-07-26 09:02:56 +0000 |
| commit | c22616258e35568f82195bf95e6cff97e2b4a1e0 (patch) | |
| tree | 1c9793a15ba0711cd94d7051d29f8caaa4540ec4 | |
| parent | 9a40416751f4518727f7a52bcf1b0ae1a8c405ff (diff) | |
gst/wavparse/gstwavparse.c: #define 'fact' RIFF chunk if we are not compiling against
Original commit message from CVS:
* 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).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/wavparse/gstwavparse.c | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -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 diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index 1e66138e..48d244a0 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -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); |