diff --git a/ChangeLog b/ChangeLog index ef5cbcb42d..eee90fd995 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-28 Tim-Philipp Müller + + * gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_subbuffer): + Don't ref NULL caps (private streams have NULL caps) (#336387); + also, no need to set caps on the same buffer twice. + 2006-03-28 Tim-Philipp Müller * gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_process_event), diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c index 0fe20d261d..5ccaa25534 100644 --- a/gst/mpegstream/gstmpegdemux.c +++ b/gst/mpegstream/gstmpegdemux.c @@ -924,7 +924,6 @@ gst_mpeg_demux_send_subbuffer (GstMPEGDemux * mpeg_demux, GST_BUFFER_TIMESTAMP (outbuf) = timestamp; GST_BUFFER_OFFSET (outbuf) = GST_BUFFER_OFFSET (buffer) + offset; - GST_BUFFER_CAPS (outbuf) = gst_caps_ref (outstream->caps); ret = gst_pad_push (outstream->pad, outbuf); if (GST_CLOCK_TIME_IS_VALID (mpeg_demux->max_gap) &&