Merge branch 'tizen' into 'tizen_gst_1.19.2'

[platform/upstream/gstreamer.git] / ext / dvdread / dvdreadsrc.c

diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c
index 2ed62a1..eb29482 100644 (file)
--- a/ext/dvdread/dvdreadsrc.c
+++ b/ext/dvdread/dvdreadsrc.c
@@ -91,11 +91,13 @@ static gint gst_dvd_read_src_get_sector_from_time (GstDvdReadSrc * src,
 
 static void gst_dvd_read_src_uri_handler_init (gpointer g_iface,
     gpointer iface_data);
+static gboolean dvdread_element_init (GstPlugin * plugin);
 
 #define gst_dvd_read_src_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstDvdReadSrc, gst_dvd_read_src, GST_TYPE_PUSH_SRC,
     G_IMPLEMENT_INTERFACE (GST_TYPE_URI_HANDLER,
         gst_dvd_read_src_uri_handler_init));
+GST_ELEMENT_REGISTER_DEFINE_CUSTOM (dvdreadsrc, dvdread_element_init);
 
 static void
 gst_dvd_read_src_finalize (GObject * object)
@@ -1038,7 +1040,7 @@ gst_dvd_read_src_set_property (GObject * object, guint prop_id,
       if (g_value_get_string (value) == NULL) {
         src->location = g_strdup ("/dev/dvd");
       } else {
-        src->location = g_strdup (g_value_get_string (value));
+        src->location = g_value_dup_string (value);
       }
       break;
     }
@@ -1397,7 +1399,7 @@ static gboolean
 gst_dvd_read_src_do_duration_query (GstDvdReadSrc * src, GstQuery * query)
 {
   GstFormat format;
-  gint64 val;
+  gint64 val = 0;
 
   gst_query_parse_duration (query, &format, NULL);
 
@@ -1790,7 +1792,7 @@ gst_dvd_read_src_uri_handler_init (gpointer g_iface, gpointer iface_data)
 }
 
 static gboolean
-plugin_init (GstPlugin * plugin)
+dvdread_element_init (GstPlugin * plugin)
 {
   GST_DEBUG_CATEGORY_INIT (gstgst_dvd_read_src_debug, "dvdreadsrc", 0,
       "DVD reader element based on dvdreadsrc");
@@ -1801,13 +1803,14 @@ plugin_init (GstPlugin * plugin)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif /* ENABLE_NLS */
+  return gst_element_register (plugin, "dvdreadsrc", GST_RANK_NONE,
+      GST_TYPE_DVD_READ_SRC);
+}
 
-  if (!gst_element_register (plugin, "dvdreadsrc", GST_RANK_NONE,
-          GST_TYPE_DVD_READ_SRC)) {
-    return FALSE;
-  }
-
-  return TRUE;
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  return GST_ELEMENT_REGISTER (dvdreadsrc, plugin);
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,