mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/qtdemux/qtdemux.c: Don't output g_warning for an unsupported format, just send a

Browse source 
Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (gst_qtdemux_chain),
(gst_qtdemux_add_stream):
Don't output g_warning for an unsupported format, just send a
GST_ELEMENT_WARNING and don't add the pad.
Fix the case where it doesn't check for a NULL pad in streaming mode.
Fixes #387137
This commit is contained in:
Jan Schmidt 2006-12-18 13:40:34 +00:00
parent 1891c3240b
commit de19264a3d
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2006-12-18 Jan Schmidt <thaytan@mad.scientist.com>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_chain),
(gst_qtdemux_add_stream):
Don't output g_warning for an unsupported format, just send a
GST_ELEMENT_WARNING and don't add the pad.
Fix the case where it doesn't check for a NULL pad in streaming mode.
Fixes #387137
2006-12-18 Tim-Philipp Müller <tim at centricular dot net> 2006-12-18 Tim-Philipp Müller <tim at centricular dot net>
* gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):

21
gst/qtdemux/qtdemux.c
View file

@ -1861,11 +1861,16 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
stream->samples[stream->sample_index].duration; stream->samples[stream->sample_index].duration;
/* send buffer */ /* send buffer */
GST_LOG_OBJECT (demux, if (stream->pad) {
"Pushing buffer with time %" GST_TIME_FORMAT " on pad %p", GST_LOG_OBJECT (demux,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), stream->pad); "Pushing buffer with time %" GST_TIME_FORMAT " on pad %p",
gst_buffer_set_caps (outbuf, stream->caps); GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), stream->pad);
ret = gst_pad_push (stream->pad, outbuf); gst_buffer_set_caps (outbuf, stream->caps);
ret = gst_pad_push (stream->pad, outbuf);
} else {
gst_buffer_unref (outbuf);
ret = GST_FLOW_OK;
}
/* combine flows */ /* combine flows */
ret = gst_qtdemux_combine_flows (demux, stream, ret); ret = gst_qtdemux_combine_flows (demux, stream, ret);
@ -2983,7 +2988,11 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux,
GST_TYPE_BUFFER, palette, NULL); GST_TYPE_BUFFER, palette, NULL);
gst_buffer_unref (palette); gst_buffer_unref (palette);
} else if (palette_count != 0) { } else if (palette_count != 0) {
g_warning ("unsupported palette depth %d", palette_count); GST_ELEMENT_WARNING (qtdemux, STREAM, NOT_IMPLEMENTED,
(NULL), ("Unsupported palette depth %d. Ignoring stream.", depth));
gst_object_unref (stream->pad);
stream->pad = NULL;
} }
} }
qtdemux->n_video_streams++; qtdemux->n_video_streams++;