From ae45cd705a00c25f64802f08242acfd4ffc131e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Loeuillet?= Date: Sun, 9 May 2004 22:56:56 +0000 Subject: [PATCH] gst/law/alaw-decode.c: put audio/x-alaw on pads, instead of audio/x-mulaw Original commit message from CVS: * gst/law/alaw-decode.c : put audio/x-alaw on pads, instead of audio/x-mulaw * gst/law/alaw-encode.c : (idem) --- ChangeLog | 2 ++ gst/law/alaw-decode.c | 4 ++-- gst/law/alaw-encode.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c341d11f7..51e0e91466 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2004-05-10 Stephane Loeuillet * 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 diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c index fdbafde57e..47c684f86a 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 b6e4825ac3..fbba4a0a2c 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",