summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-04-29 16:14:20 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-04-29 16:14:20 +0000
commiteb7e071aba9b0c3e0b563e477401982ac04586e4 (patch)
treeaa1b101c97864433c2c26d568429832cc97b1b4b
parent16b28a8eea303ed4cf7f158d2f6d4de45a54f666 (diff)
gst/wavparse/gstwavparse.c: ... and fix multichannel/WAVFORMATEX support again.
Original commit message from CVS: * gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers): ... and fix multichannel/WAVFORMATEX support again.
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--gst/wavparse/gstwavparse.c8
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fa1e16a..775a1656 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-29 Tim-Philipp Müller <tim at centricular dot net>
+
+ * gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers):
+ ... and fix multichannel/WAVFORMATEX support again.
+
2006-04-29 Stefan Kost <ensonic@users.sf.net>
* gst/wavparse/gstwavparse.c: (gst_wavparse_base_init),
diff --git a/common b/common
-Subproject a6710e67fd82147e32a18f1b63177583faffd49
+Subproject 6b67aa6dd111fb139e1be0f6a386e3ff84cce09
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index e9ab8bd0..54911a7e 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -1022,9 +1022,6 @@ gst_wavparse_stream_headers (GstWavParse * wav)
if (!(gst_riff_parse_strf_auds (GST_ELEMENT (wav), buf, &header, &extra)))
goto parse_header_error;
- if (extra)
- gst_buffer_unref (extra);
-
if (wav->streaming) {
gst_adapter_flush (wav->adapter, size);
wav->offset += size;
@@ -1035,9 +1032,12 @@ gst_wavparse_stream_headers (GstWavParse * wav)
/* Note: gst_riff_create_audio_caps might nedd to fix values in
* the header header depending on the format, so call it first */
caps =
- gst_riff_create_audio_caps (header->format, NULL, header, NULL,
+ gst_riff_create_audio_caps (header->format, NULL, header, extra,
NULL, &codec_name);
+ if (extra)
+ gst_buffer_unref (extra);
+
wav->format = header->format;
wav->rate = header->rate;
wav->channels = header->channels;