mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-06 06:22:29 +00:00
gst/playback/gstdecodebin.c: Don't put essential function call into g_return_*() macro, otherwise it'll all be replac...
Original commit message from CVS: * gst/playback/gstdecodebin.c: (try_to_link_1): Don't put essential function call into g_return_*() macro, otherwise it'll all be replaced by NOOPs when compiling with G_DISABLE_CHECKS defined.
This commit is contained in:
parent
00d7f5c760
commit
7bc79aec0e
2 changed files with 12 additions and 2 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2006-02-03 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
|
* gst/playback/gstdecodebin.c: (try_to_link_1):
|
||||||
|
Don't put essential function call into
|
||||||
|
g_return_*() macro, otherwise it'll all be
|
||||||
|
replaced by NOOPs when compiling with
|
||||||
|
G_DISABLE_CHECKS defined.
|
||||||
|
|
||||||
2006-02-03 Edgard Lima <edgard.lima@indt.org.br>
|
2006-02-03 Edgard Lima <edgard.lima@indt.org.br>
|
||||||
|
|
||||||
* ext/ogg/gstoggdemux.c:
|
* ext/ogg/gstoggdemux.c:
|
||||||
|
|
|
@ -729,6 +729,8 @@ try_to_link_1 (GstDecodeBin * decode_bin, GstElement * srcelement, GstPad * pad,
|
||||||
isdemux = is_demuxer_element (srcelement);
|
isdemux = is_demuxer_element (srcelement);
|
||||||
|
|
||||||
if (isdemux && factories != NULL) {
|
if (isdemux && factories != NULL) {
|
||||||
|
GstPadLinkReturn dqlink;
|
||||||
|
|
||||||
/* Insert a queue between demuxer and decoder */
|
/* Insert a queue between demuxer and decoder */
|
||||||
GST_DEBUG_OBJECT (decode_bin,
|
GST_DEBUG_OBJECT (decode_bin,
|
||||||
"Element %s is a demuxer, inserting a queue",
|
"Element %s is a demuxer, inserting a queue",
|
||||||
|
@ -745,8 +747,8 @@ try_to_link_1 (GstDecodeBin * decode_bin, GstElement * srcelement, GstPad * pad,
|
||||||
queuesinkpad = gst_element_get_pad (queue, "sink");
|
queuesinkpad = gst_element_get_pad (queue, "sink");
|
||||||
usedsrcpad = queuesrcpad = gst_element_get_pad (queue, "src");
|
usedsrcpad = queuesrcpad = gst_element_get_pad (queue, "src");
|
||||||
|
|
||||||
g_return_val_if_fail (gst_pad_link (pad, queuesinkpad) == GST_PAD_LINK_OK,
|
dqlink = gst_pad_link (pad, queuesinkpad);
|
||||||
NULL);
|
g_return_val_if_fail (dqlink == GST_PAD_LINK_OK, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* loop over the factories */
|
/* loop over the factories */
|
||||||
|
|
Loading…
Reference in a new issue