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.
This commit is contained in:
Tim-Philipp Müller 2006-01-30 18:57:45 +00:00
parent f0e3a8e101
commit 279475a917
3 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2006-01-30 Tim-Philipp Müller <tim at centricular dot net>
* 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 <tim at centricular dot net>
* ext/lame/gstlame.c: (gst_lame_finalize), (gst_lame_class_init),

2
common

@ -1 +1 @@
Subproject commit bc4325349e8d0ec90aa5c5e74566880cc2e82527
Subproject commit 0b93085188e83fe678ec5ded2823cd7c24dfa843

View file

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