mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

plugins: remove gstreamer-0.10 crumbs

Browse source 
GstVideoContext was used in gstreamer-0.10, which is not supported anymore.
Still, its definition was still in the code. This patch removes it.

https://bugzilla.gnome.org/show_bug.cgi?id=749113
This commit is contained in:
Víctor Manuel Jáquez Leal 2015-05-08 15:54:09 +02:00
parent be40a1d479
commit 3024640d4f
4 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/vaapi/gstvaapipluginbase.c
View file

@ -333,7 +333,8 @@ gst_vaapi_plugin_base_ensure_display (GstVaapiPluginBase * plugin)
return TRUE;
gst_vaapi_display_replace (&plugin->display, NULL);
if (!gst_vaapi_ensure_display (plugin, plugin->display_type_req))
if (!gst_vaapi_ensure_display (GST_ELEMENT (plugin),
plugin->display_type_req))
return FALSE;
plugin->display_type = gst_vaapi_display_get_display_type (plugin->display);

12
gst/vaapi/gstvaapipluginutil.c
View file

@ -247,18 +247,14 @@ gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object)
}
gboolean
gst_vaapi_ensure_display (gpointer element, GstVaapiDisplayType type)
gst_vaapi_ensure_display (GstElement * element, GstVaapiDisplayType type)
{
GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element);
GstVaapiDisplay *display;
GstVideoContext *context;
g_return_val_if_fail (GST_IS_VIDEO_CONTEXT (element), FALSE);
g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
context = GST_VIDEO_CONTEXT (element);
g_return_val_if_fail (context != NULL, FALSE);
gst_vaapi_video_context_prepare (context, display_types);
gst_vaapi_video_context_prepare (element, display_types);
/* Neighbour found and it updated the display */
if (gst_vaapi_plugin_base_has_display_type (plugin, type))
@ -272,7 +268,7 @@ gst_vaapi_ensure_display (gpointer element, GstVaapiDisplayType type)
if (!display)
return FALSE;
gst_vaapi_video_context_propagate (context, display);
gst_vaapi_video_context_propagate (element, display);
GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE (plugin, display);
gst_vaapi_display_unref (display);
return TRUE;

2
gst/vaapi/gstvaapipluginutil.h
View file

@ -31,7 +31,7 @@
G_GNUC_INTERNAL
gboolean
gst_vaapi_ensure_display (gpointer element, GstVaapiDisplayType type);
gst_vaapi_ensure_display (GstElement * element, GstVaapiDisplayType type);
G_GNUC_INTERNAL
gboolean

6
gst/vaapi/gstvaapivideocontext.h
View file

@ -31,12 +31,6 @@
#define GST_VAAPI_DISPLAY_CONTEXT_TYPE_NAME "gst.vaapi.Display"
/* Fake GstVideoContext symbols */
#define GST_VIDEO_CONTEXT(obj) (GST_ELEMENT (obj))
#define GST_IS_VIDEO_CONTEXT(obj) (GST_IS_ELEMENT (obj))
#define GstVideoContext GstElement
#define gst_video_context_prepare gst_vaapi_video_context_prepare
G_GNUC_INTERNAL
GstContext *
gst_vaapi_video_context_new_with_display (GstVaapiDisplay * display,