diff options
author | Rolf Eike Beer <eb@emlix.com> | 2020-05-29 08:22:37 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-05-29 10:20:13 +0000 |
commit | 9cdcab04921debd545aaaf2e8cd1245a5633f374 (patch) | |
tree | e0928b95a883dace10c6fa46b17f9b36aa416c25 | |
parent | f8fc4b74558c1e809e0920cb582cb1f95ef9283f (diff) | |
download | qtmultimedia-9cdcab04921debd545aaaf2e8cd1245a5633f374.tar.gz |
gsttools: do not use nullptr in C code
Changing this in "gsttools: use nullptr instead of NULL" was an oversight.
Change-Id: I6ed4a63800dc288a32c58eafaf74cdc15ea2218d
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
(cherry picked from commit ce0ae3f3bfed03e3eb334165f9dbf1151a9f9e5d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/gsttools/gstvideoconnector.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gsttools/gstvideoconnector.c b/src/gsttools/gstvideoconnector.c index 7f88a89af..b85f5bdbe 100644 --- a/src/gsttools/gstvideoconnector.c +++ b/src/gsttools/gstvideoconnector.c @@ -116,13 +116,13 @@ gst_video_connector_class_init (GstVideoConnectorClass * klass) gst_video_connector_signals[SIGNAL_RESEND_NEW_SEGMENT] = g_signal_new ("resend-new-segment", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstVideoConnectorClass, resend_new_segment), nullptr, nullptr, + G_STRUCT_OFFSET (GstVideoConnectorClass, resend_new_segment), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); gst_video_connector_signals[SIGNAL_CONNECTION_FAILED] = g_signal_new ("connection-failed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - 0, nullptr, nullptr, + 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } @@ -159,7 +159,7 @@ gst_video_connector_init (GstVideoConnector *element, element->relinked = FALSE; element->failedSignalEmited = FALSE; gst_segment_init (&element->segment, GST_FORMAT_TIME); - element->latest_buffer = nullptr; + element->latest_buffer = NULL; } static void @@ -167,9 +167,9 @@ gst_video_connector_reset (GstVideoConnector * element) { element->relinked = FALSE; element->failedSignalEmited = FALSE; - if (element->latest_buffer != nullptr) { + if (element->latest_buffer != NULL) { gst_buffer_unref (element->latest_buffer); - element->latest_buffer = nullptr; + element->latest_buffer = NULL; } gst_segment_init (&element->segment, GST_FORMAT_UNDEFINED); } @@ -196,7 +196,7 @@ gst_video_connector_buffer_alloc (GstPad * pad, guint64 offset, guint size, if (!buf) return GST_FLOW_ERROR; - *buf = nullptr; + *buf = NULL; gboolean isFailed = FALSE; while (1) { @@ -265,7 +265,7 @@ gst_video_connector_setcaps (GstPad *pad, GstCaps *caps) /* forward-negotiate */ gboolean res = gst_pad_set_caps(element->srcpad, caps); - gchar * debugmsg = nullptr; + gchar * debugmsg = NULL; GST_DEBUG_OBJECT(element, "gst_video_connector_setcaps %s %i", debugmsg = gst_caps_to_string(caps), res); if (debugmsg) g_free(debugmsg); @@ -407,7 +407,7 @@ gst_video_connector_chain (GstPad * pad, GstBuffer * buf) if (element->latest_buffer) { gst_buffer_unref (element->latest_buffer); - element->latest_buffer = nullptr; + element->latest_buffer = NULL; } element->latest_buffer = gst_buffer_ref(buf); |