mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-28 20:51:13 +00:00
discoverer: Allow GError* argument to be NULL
This is how other methods taking GError* arguments behave. Fixes #652838
This commit is contained in:
parent
4af771a1a5
commit
b2b1a7be1b
1 changed files with 7 additions and 5 deletions
|
@ -1441,7 +1441,7 @@ gst_discoverer_discover_uri_async (GstDiscoverer * discoverer,
|
|||
* gst_discoverer_discover_uri:
|
||||
* @discoverer: A #GstDiscoverer
|
||||
* @uri: The URI to run on.
|
||||
* @err: If an error occurred, this field will be filled in.
|
||||
* @err: (out) (allow-none): If an error occurred, this field will be filled in.
|
||||
*
|
||||
* Synchronously discovers the given @uri.
|
||||
*
|
||||
|
@ -1477,10 +1477,12 @@ gst_discoverer_discover_uri (GstDiscoverer * discoverer, const gchar * uri,
|
|||
discoverer_collect (discoverer);
|
||||
|
||||
/* Get results */
|
||||
if (err) {
|
||||
if (discoverer->priv->current_error)
|
||||
*err = g_error_copy (discoverer->priv->current_error);
|
||||
else
|
||||
*err = NULL;
|
||||
}
|
||||
if (res != GST_DISCOVERER_OK) {
|
||||
GST_DEBUG ("Setting result to %d (was %d)", res,
|
||||
discoverer->priv->current_info->result);
|
||||
|
|
Loading…
Reference in a new issue