summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStéphane Loeuillet <gstreamer@leroutier.net>2004-10-06 14:11:56 +0000
committerStéphane Loeuillet <gstreamer@leroutier.net>2004-10-06 14:11:56 +0000
commit8b1cf6bc9e3755de7b843b3ff1b40c12c7616958 (patch)
treee9ed3fddd44b51729079df275573c2bc467964ec
parent6f17aaa8294214267ae836f333dcba015ec66ab8 (diff)
gst/wavparse/gstwavparse.h remove duplicated defines for audio codec codes gst-libs/gst/riff/riff-ids.h
Original commit message from CVS: * gst/wavparse/gstwavparse.h remove duplicated defines for audio codec codes * gst-libs/gst/riff/riff-ids.h * gst/wavenc/riff.h: add "4CC" code for ATRAC3 audio streams add "4CC" code for ITU_G721_ADPCM (unused for now)
-rw-r--r--ChangeLog10
-rw-r--r--gst-libs/gst/riff/riff-ids.h4
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 86e7a034..b2a615d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-06 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+
+ * gst/wavparse/gstwavparse.h
+ remove duplicated defines for audio codec codes
+
+ * gst-libs/gst/riff/riff-ids.h
+ * gst/wavenc/riff.h:
+ add "4CC" code for ATRAC3 audio streams
+ add "4CC" code for ITU_G721_ADPCM (unused for now)
+
2004-10-06 Wim Taymans <wim@fluendo.com>
* gst/flx/gstflxdec.c: (gst_flxdec_init), (gst_flxdec_loop):
diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h
index 3c4fc78f..2684e6c3 100644
--- a/gst-libs/gst/riff/riff-ids.h
+++ b/gst-libs/gst/riff/riff-ids.h
@@ -271,6 +271,7 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */
#define GST_RIFF_WAVE_FORMAT_DSP_TRUESPEECH (0x0022)
#define GST_RIFF_WAVE_FORMAT_GSM610 (0x0031)
#define GST_RIFF_WAVE_FORMAT_MSN (0x0032)
+#define GST_RIFF_WAVE_FORMAT_ITU_G721_ADPCM (0x0040)
#define GST_RIFF_WAVE_FORMAT_MPEGL12 (0x0050)
#define GST_RIFF_WAVE_FORMAT_MPEGL3 (0x0055)
#define GST_RIFF_IBM_FORMAT_MULAW (0x0101)
@@ -279,7 +280,8 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */
#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_SONY_ATRAC3 (0x0270)
+#define GST_RIFF_WAVE_FORMAT_A52 (0x2000)
#define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f)
#define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750)
#define GST_RIFF_WAVE_FORMAT_VORBIS3 (0x6751)