From dded3e1a8c8df28d0c2943dd7098504f5adf3755 Mon Sep 17 00:00:00 2001 From: Owen Fraser-Green Date: Fri, 31 Jan 2003 23:06:18 +0000 Subject: [PATCH] Renamed GST_RIFF_WAVE_FORMAT_DIVX and _divx to _DIVX_WMAV1 and _DIVX_WMAV2 and added _WMAV9 Original commit message from CVS: Renamed GST_RIFF_WAVE_FORMAT_DIVX and _divx to _DIVX_WMAV1 and _DIVX_WMAV2 and added _WMAV9 --- gst-libs/gst/riff/riff.h | 5 +++-- gst/asfdemux/gstasfdemux.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/riff/riff.h b/gst-libs/gst/riff/riff.h index 33d1b4dc59..4792c5ed29 100644 --- a/gst-libs/gst/riff/riff.h +++ b/gst-libs/gst/riff/riff.h @@ -313,8 +313,9 @@ struct _gst_riff_strf_auds { /* == WaveHeader (?) */ #define GST_RIFF_IBM_FORMAT_MULAW (0x0101) #define GST_RIFF_IBM_FORMAT_ALAW (0x0102) #define GST_RIFF_IBM_FORMAT_ADPCM (0x0103) -#define GST_RIFF_WAVE_FORMAT_DIVX (0x0160) -#define GST_RIFF_WAVE_FORMAT_divx (0x0161) +#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV1 (0x0160) +#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV2 (0x0161) +#define GST_RIFF_WAVE_FORMAT_WMAV9 (0x0162) #define GST_RIFF_WAVE_FORMAT_A52 (0x2000) #define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f) #define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750) diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index dd1ebbca8e..2b4fea9d09 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -1418,8 +1418,9 @@ gst_asf_demux_add_audio_stream (GstASFDemux *asf_demux, "audio/a52", NULL); break; - case GST_RIFF_WAVE_FORMAT_DIVX: - case GST_RIFF_WAVE_FORMAT_divx: + case GST_RIFF_WAVE_FORMAT_DIVX_WMAV1: + case GST_RIFF_WAVE_FORMAT_DIVX_WMAV2: + case GST_RIFF_WAVE_FORMAT_WMAV9: new_caps = gst_caps_new ("asf_demux_audio_src", "unknown/unknown", NULL);