summaryrefslogtreecommitdiff
path: root/gst/vaapi/gstvaapivideomemory.c
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-11-21 16:35:34 +0100
committerVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-11-21 17:22:31 +0100
commit22463b96f34b0ffe0a5544976b40371ea9bdee13 (patch)
tree5e25e6ed0b2bf80eb348e321c5e9df8557614314 /gst/vaapi/gstvaapivideomemory.c
parentd799bb304156b305245ce9c6e3abc618c5097266 (diff)
vaapivideomemory: remove GST_VAAPI_TYPE_VIDEO_INFO
Remove redundant GST_VAAPI_TYPE_VIDEO_INFO, since it is a duplicate of GST_TYPE_VIDEO_INFO created before gstreamer 1.6, where the boxed type was created. https://bugzilla.gnome.org/show_bug.cgi?id=774782
Diffstat (limited to 'gst/vaapi/gstvaapivideomemory.c')
-rw-r--r--gst/vaapi/gstvaapivideomemory.c41
1 files changed, 2 insertions, 39 deletions
diff --git a/gst/vaapi/gstvaapivideomemory.c b/gst/vaapi/gstvaapivideomemory.c
index 03402b9b..854638ae 100644
--- a/gst/vaapi/gstvaapivideomemory.c
+++ b/gst/vaapi/gstvaapivideomemory.c
@@ -1009,42 +1009,6 @@ gst_vaapi_dmabuf_allocator_new (GstVaapiDisplay * display,
/* --- GstVaapiVideoInfo = { GstVideoInfo, flags } --- */
/* ------------------------------------------------------------------------ */
-static GstVideoInfo *
-gst_vaapi_video_info_copy (const GstVideoInfo * vip)
-{
- GstVideoInfo *out_vip;
-
- out_vip = g_slice_new (GstVideoInfo);
- if (!out_vip)
- return NULL;
-
- gst_video_info_init (out_vip);
- *out_vip = *vip;
- return out_vip;
-}
-
-static void
-gst_vaapi_video_info_free (GstVideoInfo * vip)
-{
- g_slice_free (GstVideoInfo, vip);
-}
-
-#define GST_VAAPI_TYPE_VIDEO_INFO gst_vaapi_video_info_get_type ()
-static GType
-gst_vaapi_video_info_get_type (void)
-{
- static gsize g_type;
-
- if (g_once_init_enter (&g_type)) {
- GType type;
- type = g_boxed_type_register_static ("GstVaapiVideoInfo",
- (GBoxedCopyFunc) gst_vaapi_video_info_copy,
- (GBoxedFreeFunc) gst_vaapi_video_info_free);
- g_once_init_leave (&g_type, type);
- }
- return (GType) g_type;
-}
-
#define GST_VAAPI_VIDEO_INFO_QUARK gst_vaapi_video_info_quark_get ()
static GQuark
gst_vaapi_video_info_quark_get (void)
@@ -1140,9 +1104,8 @@ gst_allocator_set_vaapi_video_info (GstAllocator * allocator,
g_return_val_if_fail (vip != NULL, FALSE);
g_object_set_qdata_full (G_OBJECT (allocator), GST_VAAPI_VIDEO_INFO_QUARK,
- gst_structure_new_id (GST_VAAPI_VIDEO_INFO_QUARK,
- INFO_QUARK, GST_VAAPI_TYPE_VIDEO_INFO, vip,
- FLAGS_QUARK, G_TYPE_UINT, flags, NULL),
+ gst_structure_new_id (GST_VAAPI_VIDEO_INFO_QUARK, INFO_QUARK,
+ GST_TYPE_VIDEO_INFO, vip, FLAGS_QUARK, G_TYPE_UINT, flags, NULL),
(GDestroyNotify) gst_structure_free);
return TRUE;