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.
This commit is contained in:
Tim-Philipp Müller 2006-04-29 16:14:20 +00:00
parent 16b28a8eea
commit eb7e071aba
3 changed files with 10 additions and 5 deletions

View file

@ -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),

2
common

@ -1 +1 @@
Subproject commit a6710e67fd82147e32a18f1b63177583faffd498
Subproject commit 6b67aa6dd111fb139e1be0f6a386e3ff84cce091

View file

@ -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;