From 279475a9176d84416913523a1c7e3a56f867a246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 30 Jan 2006 18:57:45 +0000 Subject: [PATCH] gst/mpegstream/gstmpegparse.c: If we haven't set caps on a source pad yet, the caps on the pad are NULL, not un-fixed... Original commit message from CVS: * gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_send_buffer): If we haven't set caps on a source pad yet, the caps on the pad are NULL, not un-fixed. Set caps on outgoing buffers. --- ChangeLog | 6 ++++++ common | 2 +- gst/mpegstream/gstmpegparse.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e47e5611d5..ce89f004cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-30 Tim-Philipp Müller + + * gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_send_buffer): + If we haven't set caps on a source pad yet, the caps on the + pad are NULL, not un-fixed. Set caps on outgoing buffers. + 2006-01-23 Tim-Philipp Müller * ext/lame/gstlame.c: (gst_lame_finalize), (gst_lame_class_init), diff --git a/common b/common index bc4325349e..0b93085188 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit bc4325349e8d0ec90aa5c5e74566880cc2e82527 +Subproject commit 0b93085188e83fe678ec5ded2823cd7c24dfa843 diff --git a/gst/mpegstream/gstmpegparse.c b/gst/mpegstream/gstmpegparse.c index 355acff9b7..8e0b585f6b 100644 --- a/gst/mpegstream/gstmpegparse.c +++ b/gst/mpegstream/gstmpegparse.c @@ -308,7 +308,7 @@ gst_mpeg_parse_send_buffer (GstMPEGParse * mpeg_parse, GstBuffer * buffer, { GstFlowReturn result = GST_FLOW_OK; - if (!gst_caps_is_fixed (GST_PAD_CAPS (mpeg_parse->srcpad))) { + if (!GST_PAD_CAPS (mpeg_parse->srcpad)) { gboolean mpeg2 = GST_MPEG_PACKETIZE_IS_MPEG2 (mpeg_parse->packetize); GstCaps *caps; @@ -330,6 +330,7 @@ gst_mpeg_parse_send_buffer (GstMPEGParse * mpeg_parse, GstBuffer * buffer, GST_DEBUG_OBJECT (mpeg_parse, "current buffer time: %" GST_TIME_FORMAT, GST_TIME_ARGS (time)); + gst_buffer_set_caps (buffer, GST_PAD_CAPS (mpeg_parse->srcpad)); result = gst_pad_push (mpeg_parse->srcpad, buffer); return result;