summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-07-22 13:35:48 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-07-22 13:35:48 +0000
commita427a79b61f9bb19a13f410ba1efde8daced28e4 (patch)
tree29f5184afa266021fccd20d9363fe7bb034fefb7
parentf678fed691eca454176235c2e5a1d9bcf6e08c72 (diff)
downloadgstreamer-plugins-bad-a427a79b61f9bb19a13f410ba1efde8daced28e4.tar.gz
gst/: Allow 24/32-bpp songs, too, and blockalign samples to the header-specified size (if any). Fixes #311070.
Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps_with_data): * gst/wavparse/gstwavparse.c: (gst_wavparse_loop): Allow 24/32-bpp songs, too, and blockalign samples to the header-specified size (if any). Fixes #311070.
-rw-r--r--ChangeLog8
-rw-r--r--gst-libs/gst/riff/riff-media.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c97b05a9..d8741e7ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * gst-libs/gst/riff/riff-media.c:
+ (gst_riff_create_audio_caps_with_data):
+ * gst/wavparse/gstwavparse.c: (gst_wavparse_loop):
+ Allow 24/32-bpp songs, too, and blockalign samples to the
+ header-specified size (if any). Fixes #311070.
+
2005-07-22 Tim-Philipp Müller <tim at centricular dot net>
* ext/flac/gstflacdec.c: (gst_flacdec_write),
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 809541951..5ed25037f 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -446,7 +446,8 @@ gst_riff_create_audio_caps_with_data (guint16 codec_id,
caps = gst_caps_from_string ("audio/x-raw-int, "
"endianness = (int) LITTLE_ENDIAN, "
"signed = (boolean) { true, false }, "
- "width = (int) { 8, 16 }, " "depth = (int) { 8, 16 }");
+ "width = (int) { 8, 16, 24, 32 }, "
+ "depth = (int) { 8, 16, 24, 32 }");
}
if (codec_name && strf)
*codec_name = g_strdup_printf ("Uncompressed %d-bit PCM audio",