summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--gst/law/alaw-decode.c4
-rw-r--r--gst/law/alaw-encode.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c341d11..51e0e914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2004-05-10 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
* gst/law/alaw.c : alawdec should be registered with type ALAWDEC, not ALAWENC
+ * gst/law/alaw-decode.c : put audio/x-alaw on pads, instead of audio/x-mulaw
+ * gst/law/alaw-encode.c : (idem)
2004-05-09 Benjamin Otte <otte@gnome.org>
diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c
index fdbafde5..47c684f8 100644
--- a/gst/law/alaw-decode.c
+++ b/gst/law/alaw-decode.c
@@ -82,7 +82,7 @@ alawdec_getcaps (GstPad * pad)
if (pad == alawdec->sinkpad) {
otherpad = alawdec->srcpad;
- base_caps = gst_caps_new_simple ("audio/x-mulaw", NULL);
+ base_caps = gst_caps_new_simple ("audio/x-alaw", NULL);
} else {
otherpad = alawdec->sinkpad;
base_caps = gst_caps_new_simple ("audio/x-raw-int",
@@ -125,7 +125,7 @@ alawdec_link (GstPad * pad, const GstCaps * caps)
if (pad == alawdec->srcpad) {
otherpad = alawdec->sinkpad;
- base_caps = gst_caps_new_simple ("audio/x-mulaw", NULL);
+ base_caps = gst_caps_new_simple ("audio/x-alaw", NULL);
} else {
otherpad = alawdec->srcpad;
base_caps = gst_caps_new_simple ("audio/x-raw-int",
diff --git a/gst/law/alaw-encode.c b/gst/law/alaw-encode.c
index b6e4825a..fbba4a0a 100644
--- a/gst/law/alaw-encode.c
+++ b/gst/law/alaw-encode.c
@@ -125,7 +125,7 @@ alawenc_getcaps (GstPad * pad)
if (pad == alawenc->srcpad) {
otherpad = alawenc->sinkpad;
- base_caps = gst_caps_new_simple ("audio/x-mulaw", NULL);
+ base_caps = gst_caps_new_simple ("audio/x-alaw", NULL);
} else {
otherpad = alawenc->srcpad;
base_caps = gst_caps_new_simple ("audio/x-raw-int",
@@ -168,7 +168,7 @@ alawenc_link (GstPad * pad, const GstCaps * caps)
if (pad == alawenc->sinkpad) {
otherpad = alawenc->srcpad;
- base_caps = gst_caps_new_simple ("audio/x-mulaw", NULL);
+ base_caps = gst_caps_new_simple ("audio/x-alaw", NULL);
} else {
otherpad = alawenc->sinkpad;
base_caps = gst_caps_new_simple ("audio/x-raw-int",