rename WMAx codec defines to be consistent

Original commit message from CVS:
rename WMAx codec defines to be consistent

diff --git a/gst/wavenc/riff.h b/gst/wavenc/riff.h
index 141ed1f..6e3c60a 100644 (file)
--- a/gst/wavenc/riff.h
+++ b/gst/wavenc/riff.h
@@ -311,9 +311,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_WMAV1     (0x0160)
-#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV2     (0x0161)
-#define GST_RIFF_WAVE_FORMAT_WMAV9          (0x0162)
+#define GST_RIFF_WAVE_FORMAT_WMAV1          (0x0160)
+#define GST_RIFF_WAVE_FORMAT_WMAV2          (0x0161)
+#define GST_RIFF_WAVE_FORMAT_WMAV3          (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/wavparse/gstwavparse.h b/gst/wavparse/gstwavparse.h
index 53b14b5..13ae5ea 100644 (file)
--- a/gst/wavparse/gstwavparse.h
+++ b/gst/wavparse/gstwavparse.h
@@ -114,9 +114,9 @@ typedef struct _gst_riff_fmt {
 #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_WMAV1     (0x0160)
-#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV2     (0x0161)
-#define GST_RIFF_WAVE_FORMAT_WMAV9          (0x0162)
+#define GST_RIFF_WAVE_FORMAT_WMAV1          (0x0160)
+#define GST_RIFF_WAVE_FORMAT_WMAV2          (0x0161)
+#define GST_RIFF_WAVE_FORMAT_WMAV3          (0x0162)
 #define GST_RIFF_WAVE_FORMAT_VORBIS1        (0x674f)
 #define GST_RIFF_WAVE_FORMAT_VORBIS2        (0x6750)
 #define GST_RIFF_WAVE_FORMAT_VORBIS3        (0x6751)

diff --git a/gst/wavparse/riff.h b/gst/wavparse/riff.h
index 141ed1f..6e3c60a 100644 (file)
--- a/gst/wavparse/riff.h
+++ b/gst/wavparse/riff.h
@@ -311,9 +311,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_WMAV1     (0x0160)
-#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV2     (0x0161)
-#define GST_RIFF_WAVE_FORMAT_WMAV9          (0x0162)
+#define GST_RIFF_WAVE_FORMAT_WMAV1          (0x0160)
+#define GST_RIFF_WAVE_FORMAT_WMAV2          (0x0161)
+#define GST_RIFF_WAVE_FORMAT_WMAV3          (0x0162)
 #define GST_RIFF_WAVE_FORMAT_A52           (0x2000)
 #define GST_RIFF_WAVE_FORMAT_VORBIS1        (0x674f)
 #define GST_RIFF_WAVE_FORMAT_VORBIS2        (0x6750)