Commit 7966c804 authored by Jan Schmidt's avatar Jan Schmidt
Browse files

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

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
parent ef691f38
......@@ -1861,11 +1861,16 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
stream->samples[stream->sample_index].duration;
/* send buffer */
GST_LOG_OBJECT (demux,
"Pushing buffer with time %" GST_TIME_FORMAT " on pad %p",
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), stream->pad);
gst_buffer_set_caps (outbuf, stream->caps);
ret = gst_pad_push (stream->pad, outbuf);
if (stream->pad) {
GST_LOG_OBJECT (demux,
"Pushing buffer with time %" GST_TIME_FORMAT " on pad %p",
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), stream->pad);
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 */
ret = gst_qtdemux_combine_flows (demux, stream, ret);
......@@ -2983,7 +2988,11 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux,
GST_TYPE_BUFFER, palette, NULL);
gst_buffer_unref (palette);
} 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++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment