diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-02-22 13:07:07 +0100 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-03-03 12:31:05 +0100 |
commit | a47f52bb962299244537bb0ca8b7c09ecf829785 (patch) | |
tree | 4a727f295e8143f72d3a3a8f5a5f68b942ce79cb /gst-libs | |
parent | 0a5ff713e709f41a54e6ed844849c33f8274d7a0 (diff) | |
download | gstreamer-plugins-bad-a47f52bb962299244537bb0ca8b7c09ecf829785.tar.gz |
egl: Mark memory as not mappable if it isn't
Diffstat (limited to 'gst-libs')
-rw-r--r-- | gst-libs/gst/egl/egl.c | 6 | ||||
-rw-r--r-- | gst-libs/gst/egl/egl.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gst-libs/gst/egl/egl.c b/gst-libs/gst/egl/egl.c index 82e1f1471..f6f13b9ce 100644 --- a/gst-libs/gst/egl/egl.c +++ b/gst-libs/gst/egl/egl.c @@ -237,7 +237,8 @@ gst_egl_image_allocator_alloc (GstAllocator * allocator, GstMemory * gst_egl_image_allocator_wrap (GstAllocator * allocator, GstEGLDisplay * display, EGLImageKHR image, GstEGLImageType type, - gsize size, gpointer user_data, GDestroyNotify user_data_destroy) + GstMemoryFlags flags, gsize size, gpointer user_data, + GDestroyNotify user_data_destroy) { GstEGLImageMemory *mem; @@ -250,7 +251,8 @@ gst_egl_image_allocator_wrap (GstAllocator * allocator, } mem = g_slice_new (GstEGLImageMemory); - gst_memory_init (GST_MEMORY_CAST (mem), 0, allocator, NULL, size, 0, 0, size); + gst_memory_init (GST_MEMORY_CAST (mem), flags, + allocator, NULL, size, 0, 0, size); mem->display = gst_egl_display_ref (display); mem->image = image; diff --git a/gst-libs/gst/egl/egl.h b/gst-libs/gst/egl/egl.h index ac5dfe285..a174950ae 100644 --- a/gst-libs/gst/egl/egl.h +++ b/gst-libs/gst/egl/egl.h @@ -54,7 +54,7 @@ GstEGLImageType gst_egl_image_memory_get_type (GstMemory * mem); /* Generic EGLImage allocator that doesn't support mapping, copying or anything */ GstAllocator * gst_egl_image_allocator_obtain (void); GstMemory * gst_egl_image_allocator_alloc (GstAllocator * allocator, GstEGLDisplay * display, GstEGLImageType type, gint width, gint height, gsize * size); -GstMemory * gst_egl_image_allocator_wrap (GstAllocator * allocator, GstEGLDisplay * display, EGLImageKHR image, GstEGLImageType type, gsize size, gpointer user_data, GDestroyNotify user_data_destroy); +GstMemory * gst_egl_image_allocator_wrap (GstAllocator * allocator, GstEGLDisplay * display, EGLImageKHR image, GstEGLImageType type, GstMemoryFlags flags, gsize size, gpointer user_data, GDestroyNotify user_data_destroy); /* EGLDisplay wrapper with refcount, connection is closed after last ref is gone */ GstEGLDisplay * gst_egl_display_new (EGLDisplay display); |