diff --git a/ChangeLog b/ChangeLog index 203ee8bc79..4820dd0332 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-07-02 Tim-Philipp Müller + + Patch by: Michael Sheldon + + * ext/alsa/gstalsasrc.c: + Add 32 bps to template caps and increase channels range + from [1,2] to [1,MAX]. See #346326. + 2006-06-30 Tim-Philipp Müller * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps): diff --git a/common b/common index 123195d3bb..2cd1cf860c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 123195d3bbcc0b6e1cf867d3a180685f8766a0be +Subproject commit 2cd1cf860cd15e61827c0f5f1db96f877344c722 diff --git a/ext/alsa/gstalsasrc.c b/ext/alsa/gstalsasrc.c index 89ba5825de..93ce1500ab 100644 --- a/ext/alsa/gstalsasrc.c +++ b/ext/alsa/gstalsasrc.c @@ -114,16 +114,22 @@ static GstStaticPadTemplate alsasrc_src_factory = GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw-int, " + "endianness = (int) { " ALSA_SRC_FACTORY_ENDIANNESS " }, " + "signed = (boolean) { TRUE, FALSE }, " + "width = (int) 32, " + "depth = (int) 32, " + "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ]; " + "audio/x-raw-int, " "endianness = (int) { " ALSA_SRC_FACTORY_ENDIANNESS " }, " "signed = (boolean) { TRUE, FALSE }, " "width = (int) 16, " "depth = (int) 16, " - "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]; " + "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ]; " "audio/x-raw-int, " "signed = (boolean) { TRUE, FALSE }, " "width = (int) 8, " "depth = (int) 8, " - "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]") + "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ]") ); static void