summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2008-09-03 14:00:06 +0000
committerEdward Hervey <bilboed@bilboed.com>2008-09-03 14:00:06 +0000
commit21952ab09a57431687360f89170471dd3617f993 (patch)
tree3c505cfa79a42e953b7be3daf585f1d5e637f427
parent3a0b6ebcfb387dd8458075d5fe92a36b3fd38074 (diff)
gst-libs/gst/riff/riff-media.c: Use a decent caps for TrueSpeech instead of a ffmpeg-specific one.
Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps): Use a decent caps for TrueSpeech instead of a ffmpeg-specific one. This will also be fixed for upcoming gst-ffmpeg release so that once this release of -base is out, it will work with the latest gst-ffmpeg release.
-rw-r--r--ChangeLog8
-rw-r--r--gst-libs/gst/riff/riff-media.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 340c0536..e006b048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-09-03 Edward Hervey <edward.hervey@collabora.co.uk>
+ * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps):
+ Use a decent caps for TrueSpeech instead of a ffmpeg-specific one.
+ This will also be fixed for upcoming gst-ffmpeg release so that once
+ this release of -base is out, it will work with the latest gst-ffmpeg
+ release.
+
+2008-09-03 Edward Hervey <edward.hervey@collabora.co.uk>
+
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps),
(gst_riff_create_audio_template_caps):
Add Truespeech mapping for RIFF formats (AVI/WAV).
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 1d95277d..47ed1d16 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -1051,7 +1051,7 @@ gst_riff_create_audio_caps (guint16 codec_id,
case GST_RIFF_WAVE_FORMAT_DSP_TRUESPEECH:
rate_min = 8000;
rate_max = 8000;
- caps = gst_caps_new_simple ("audio/x-gst_ff-truespeech", NULL);
+ caps = gst_caps_new_simple ("audio/x-truespeech", NULL);
if (codec_name)
*codec_name = g_strdup ("DSP Group TrueSpeech");
break;