summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Loeuillet <gstreamer@leroutier.net>2005-01-05 21:46:19 +0000
committerStéphane Loeuillet <gstreamer@leroutier.net>2005-01-05 21:46:19 +0000
commit74cf60cca5e3be167e242b2c56c58410e22404c5 (patch)
treea3ab9ea21bbfd2577f57a32886d7dc1b47043795
parent528428db8057794d87b7cb9848feb4829349c92b (diff)
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)
-rw-r--r--ChangeLog11
-rw-r--r--gst/wavenc/riff.h2
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e7d7158c..755c8f31 100644
--- 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/wavenc/riff.h b/gst/wavenc/riff.h
index 5ec30177..f0476038 100644
--- a/gst/wavenc/riff.h
+++ b/gst/wavenc/riff.h
@@ -328,6 +328,8 @@ 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;