mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

applemedia: fix build on iOS

Browse source 
Fix build after 779dc3132c
This commit is contained in:
Alessandro Decina 2015-12-17 15:07:33 +11:00
parent 4f550ff50f
commit 491e2eefcb
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/applemedia/videotexturecache.m
View file

@ -155,7 +155,7 @@ gl_mem_from_buffer (GstVideoTextureCache * cache,
GstGLBaseMemoryAllocator *base_mem_alloc; GstGLBaseMemoryAllocator *base_mem_alloc;
GstGLVideoAllocationParams *params; GstGLVideoAllocationParams *params;
base_memory_alloc = GST_GL_BASE_MEMORY_ALLOCATOR (gst_allocator_find (GST_GL_MEMORY_PBO_ALLOCATOR_NAME)); base_mem_alloc = GST_GL_BASE_MEMORY_ALLOCATOR (gst_allocator_find (GST_GL_MEMORY_PBO_ALLOCATOR_NAME));
*mem1 = NULL; *mem1 = NULL;
*mem2 = NULL; *mem2 = NULL;
@ -175,7 +175,7 @@ gl_mem_from_buffer (GstVideoTextureCache * cache,
gl_target = gst_gl_texture_target_from_gl (CVOpenGLESTextureGetTarget (texture)); gl_target = gst_gl_texture_target_from_gl (CVOpenGLESTextureGetTarget (texture));
params = gst_gl_video_allocation_params_new_wrapped_texture (cache->ctx, params = gst_gl_video_allocation_params_new_wrapped_texture (cache->ctx,
NULL, &cache->input_info, 0, NULL, gl_target, NULL, &cache->input_info, 0, NULL, gl_target,
CVOpenGLTextureGetName (texture), (GDestroyNotify) CFRelease, CVOpenGLESTextureGetName (texture), (GDestroyNotify) CFRelease,
texture); texture);
*mem1 = (GstMemory *) gst_gl_base_memory_alloc (base_mem_alloc, *mem1 = (GstMemory *) gst_gl_base_memory_alloc (base_mem_alloc,
@ -199,9 +199,9 @@ gl_mem_from_buffer (GstVideoTextureCache * cache,
goto error; goto error;
gl_target = gst_gl_texture_target_from_gl (CVOpenGLESTextureGetTarget (texture)); gl_target = gst_gl_texture_target_from_gl (CVOpenGLESTextureGetTarget (texture));
params = gst_gl_video_allocation_paramc_new_wrapped_texture (cache->ctx, params = gst_gl_video_allocation_params_new_wrapped_texture (cache->ctx,
NULL, &cache->input_info, 0, NULL, gl_target, NULL, &cache->input_info, 0, NULL, gl_target,
CVOpenGLTextureGetName (texture), (GDestroyNotify) CFRelease, CVOpenGLESTextureGetName (texture), (GDestroyNotify) CFRelease,
texture); texture);
*mem1 = (GstMemory *) gst_gl_base_memory_alloc (base_mem_alloc, *mem1 = (GstMemory *) gst_gl_base_memory_alloc (base_mem_alloc,
@ -222,10 +222,10 @@ gl_mem_from_buffer (GstVideoTextureCache * cache,
gl_target = gst_gl_texture_target_from_gl (CVOpenGLESTextureGetTarget (texture)); gl_target = gst_gl_texture_target_from_gl (CVOpenGLESTextureGetTarget (texture));
params = gst_gl_video_allocation_params_new_wrapped_texture (cache->ctx, params = gst_gl_video_allocation_params_new_wrapped_texture (cache->ctx,
NULL, &cache->input_info, 1, NULL, gl_target, NULL, &cache->input_info, 1, NULL, gl_target,
CVOpenGLTextureGetName (texture), (GDestroyNotify) CFRelease, CVOpenGLESTextureGetName (texture), (GDestroyNotify) CFRelease,
texture); texture);
*mem1 = (GstMemory *) gst_gl_base_memory_alloc (base_mem_alloc, *mem2 = (GstMemory *) gst_gl_base_memory_alloc (base_mem_alloc,
(GstGLAllocationParams *) params); (GstGLAllocationParams *) params);
gst_gl_allocation_params_free ((GstGLAllocationParams *) params); gst_gl_allocation_params_free ((GstGLAllocationParams *) params);
break; break;
@ -237,8 +237,10 @@ gl_mem_from_buffer (GstVideoTextureCache * cache,
gst_object_unref (base_mem_alloc); gst_object_unref (base_mem_alloc);
return TRUE;
error: error:
return ret; return FALSE;
} }
#else /* !HAVE_IOS */ #else /* !HAVE_IOS */