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)
This commit is contained in:
Stéphane Loeuillet 2004-10-06 14:11:56 +00:00
parent 6f17aaa829
commit 8b1cf6bc9e
2 changed files with 13 additions and 1 deletions

View file

@ -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> 2004-10-06 Wim Taymans <wim@fluendo.com>
* gst/flx/gstflxdec.c: (gst_flxdec_init), (gst_flxdec_loop): * gst/flx/gstflxdec.c: (gst_flxdec_init), (gst_flxdec_loop):

View file

@ -271,6 +271,7 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */
#define GST_RIFF_WAVE_FORMAT_DSP_TRUESPEECH (0x0022) #define GST_RIFF_WAVE_FORMAT_DSP_TRUESPEECH (0x0022)
#define GST_RIFF_WAVE_FORMAT_GSM610 (0x0031) #define GST_RIFF_WAVE_FORMAT_GSM610 (0x0031)
#define GST_RIFF_WAVE_FORMAT_MSN (0x0032) #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_MPEGL12 (0x0050)
#define GST_RIFF_WAVE_FORMAT_MPEGL3 (0x0055) #define GST_RIFF_WAVE_FORMAT_MPEGL3 (0x0055)
#define GST_RIFF_IBM_FORMAT_MULAW (0x0101) #define GST_RIFF_IBM_FORMAT_MULAW (0x0101)
@ -279,6 +280,7 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */
#define GST_RIFF_WAVE_FORMAT_WMAV1 (0x0160) #define GST_RIFF_WAVE_FORMAT_WMAV1 (0x0160)
#define GST_RIFF_WAVE_FORMAT_WMAV2 (0x0161) #define GST_RIFF_WAVE_FORMAT_WMAV2 (0x0161)
#define GST_RIFF_WAVE_FORMAT_WMAV3 (0x0162) #define GST_RIFF_WAVE_FORMAT_WMAV3 (0x0162)
#define GST_RIFF_WAVE_FORMAT_SONY_ATRAC3 (0x0270)
#define GST_RIFF_WAVE_FORMAT_A52 (0x2000) #define GST_RIFF_WAVE_FORMAT_A52 (0x2000)
#define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f) #define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f)
#define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750) #define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750)