projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 0.11
[platform/upstream/gstreamer.git]
/
plugins
/
elements
/
gstfdsrc.c
diff --git
a/plugins/elements/gstfdsrc.c
b/plugins/elements/gstfdsrc.c
index
5fd1b72
..
0ca9115
100644
(file)
--- a/
plugins/elements/gstfdsrc.c
+++ b/
plugins/elements/gstfdsrc.c
@@
-605,29
+605,31
@@
gst_fd_src_uri_get_type (GType type)
return GST_URI_SRC;
}
return GST_URI_SRC;
}
-static
gchar *
*
+static
const gchar *const
*
gst_fd_src_uri_get_protocols (GType type)
{
gst_fd_src_uri_get_protocols (GType type)
{
- static
gchar *protocols[] = { (char *)
"fd", NULL };
+ static
const gchar *protocols[] = {
"fd", NULL };
return protocols;
}
return protocols;
}
-static
const
gchar *
+static gchar *
gst_fd_src_uri_get_uri (GstURIHandler * handler)
{
GstFdSrc *src = GST_FD_SRC (handler);
gst_fd_src_uri_get_uri (GstURIHandler * handler)
{
GstFdSrc *src = GST_FD_SRC (handler);
- return src->uri;
+ /* FIXME: make thread-safe */
+ return g_strdup (src->uri);
}
static gboolean
}
static gboolean
-gst_fd_src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
+gst_fd_src_uri_set_uri (GstURIHandler * handler, const gchar * uri,
+ GError ** err)
{
gchar *protocol, *q;
GstFdSrc *src = GST_FD_SRC (handler);
gint fd;
{
gchar *protocol, *q;
GstFdSrc *src = GST_FD_SRC (handler);
gint fd;
- guint64 size =
-
1;
+ guint64 size =
(guint64) -
1;
GST_INFO_OBJECT (src, "checking uri %s", uri);
GST_INFO_OBJECT (src, "checking uri %s", uri);