gst/: Add AMR (VBR and CBR) ids to riff.h audio codec list

Original commit message from CVS:
* gst-libs/gst/riff/riff-ids.h:
* gst/wavenc/riff.h:
Add AMR (VBR and CBR) ids to riff.h audio codec list

* gst/asfdemux/gstasfdemux.c:
(gst_asf_demux_process_ext_content_desc),
(gst_asf_demux_process_object):
Retrieve more tags from ASF files (Genre, AlbumTitle, Artist)

diff --git a/ChangeLog b/ChangeLog
index e7d7158..755c8f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-01-05  Stephane LOEUILLET  <stephane.loeuillet@tiscali.fr>
+
+       * gst-libs/gst/riff/riff-ids.h:
+       * gst/wavenc/riff.h:
+        Add AMR (VBR and CBR) ids to riff.h audio codec list
+
+       * gst/asfdemux/gstasfdemux.c:
+       (gst_asf_demux_process_ext_content_desc),
+       (gst_asf_demux_process_object):
+         Retrieve more tags from ASF files (Genre, AlbumTitle, Artist)
+
 2005-01-05  Martin Eikermann  <meiker@upb.de>
 
        Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>

diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h
index f6937df..453df2e 100644 (file)
--- a/gst-libs/gst/riff/riff-ids.h
+++ b/gst-libs/gst/riff/riff-ids.h
@@ -293,6 +293,8 @@ typedef struct _gst_riff_strf_auds {       /* == WaveHeader (?) */
 #define GST_RIFF_WAVE_FORMAT_VORBIS1PLUS    (0x676f)
 #define GST_RIFF_WAVE_FORMAT_VORBIS2PLUS    (0x6770)
 #define GST_RIFF_WAVE_FORMAT_VORBIS3PLUS    (0x6771)
+#define GST_RIFF_WAVE_FORMAT_GSM_AMR_CBR    (0x7A21)
+#define GST_RIFF_WAVE_FORMAT_GSM_AMR_VBR    (0x7A22)
   guint16 channels;
   guint32 rate;
   guint32 av_bps;