diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2005-12-19 15:06:27 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2005-12-19 15:06:27 +0000 |
| commit | 6fd965f953320b03f12522a473747f71c5732d38 (patch) | |
| tree | c7cc4dcde3633aca6309e3229b47f06f2231ddaa /gst/wavparse | |
| parent | a05fc627837838ff157ab4b702674407e627c498 (diff) | |
gst/avi/gstavidemux.c: Construct index for indexless files.
Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_reset),
(gst_avi_demux_handle_src_event), (gst_avi_demux_parse_stream),
(gst_avi_demux_parse_odml), (gst_avi_demux_peek_tag),
(gst_avi_demux_next_data_buffer), (gst_avi_demux_stream_scan),
(gst_avi_demux_stream_header), (gst_avi_demux_loop):
Construct index for indexless files.
Make sure pad/buffers are correctly reset to NULL once we don't need
them anymore, else we get lovely segfaults/assertions.
* gst/wavparse/gstwavparse.c:
Yes, you can have 96KHz audio and wma in wav :(
Diffstat (limited to 'gst/wavparse')
| -rw-r--r-- | gst/wavparse/gstwavparse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index 64f406e7..39e193e3 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -73,7 +73,7 @@ static GstStaticPadTemplate src_template_factory = "signed = (boolean) { true, false }, " "width = (int) { 8, 16, 24, 32 }, " "depth = (int) { 8, 16, 24, 32 }, " - "rate = (int) [ 8000, 48000 ], " + "rate = (int) [ 8000, 96000 ], " "channels = (int) [ 1, 2 ]; " "audio/mpeg, " "mpegversion = (int) 1, " @@ -94,7 +94,8 @@ static GstStaticPadTemplate src_template_factory = "layout = (string) dvi, " "block_align = (int) [ 1, 8192 ], " "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ];" - "audio/x-vnd.sony.atrac3") + "audio/x-vnd.sony.atrac3;" + "audio/x-wma, " "wmaversion = (int) [ 1, 2 ]") ); /* WavParse signals and args */ |