From 084df6d28f6fdd30b2374a5e904f36a53b0e88bf Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 15 Sep 2004 21:43:05 +0000 Subject: [PATCH] gst/mpegstream/gstdvddemux.c: Caps are only set if the type of the stream is unknown, but this is initialized in ->in... Original commit message from CVS: * gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_get_audio_stream): Caps are only set if the type of the stream is unknown, but this is initialized in ->init_stream(), so set to UNKNOWN after calling ->init_stream() so that capsnego starts. --- ChangeLog | 7 +++++++ gst/mpegstream/gstdvddemux.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 655c678..f9d801a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2004-09-15 Ronald S. Bultje + * gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_get_audio_stream): + Caps are only set if the type of the stream is unknown, but this + is initialized in ->init_stream(), so set to UNKNOWN after calling + ->init_stream() so that capsnego starts. + +2004-09-15 Ronald S. Bultje + * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query), (gst_avi_demux_stream_data): Just hardcode for raw audio then. AVI audio sucks. diff --git a/gst/mpegstream/gstdvddemux.c b/gst/mpegstream/gstdvddemux.c index f39587d..15f0088 100644 --- a/gst/mpegstream/gstdvddemux.c +++ b/gst/mpegstream/gstdvddemux.c @@ -501,7 +501,6 @@ gst_dvd_demux_get_audio_stream (GstMPEGDemux * mpeg_demux, } str = mpeg_demux->audio_stream[stream_nr]; - if (str == NULL) { if (type != GST_DVD_DEMUX_AUDIO_LPCM) { str = g_new0 (GstMPEGStream, 1); @@ -509,11 +508,12 @@ gst_dvd_demux_get_audio_stream (GstMPEGDemux * mpeg_demux, lpcm_str = g_new0 (GstDVDLPCMStream, 1); str = (GstMPEGStream *) lpcm_str; } - str->type = GST_MPEG_DEMUX_AUDIO_UNKNOWN; name = g_strdup_printf ("audio_%02d", stream_nr); DEMUX_CLASS (dvd_demux)->init_stream (mpeg_demux, type, str, stream_nr, name, DEMUX_CLASS (dvd_demux)->audio_template); + /* update caps */ + str->type = GST_MPEG_DEMUX_AUDIO_UNKNOWN; g_free (name); mpeg_demux->audio_stream[stream_nr] = str; -- 2.7.4