vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Mar 3 09:33:10 2019 +0200| [7be1e1af9ea5c024c0da08eac04c71e042294a6e] | committer: Rémi Denis-Courmont
gst: fix callback prototypes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7be1e1af9ea5c024c0da08eac04c71e042294a6e --- modules/codec/gstreamer/gstvlcpictureplaneallocator.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/codec/gstreamer/gstvlcpictureplaneallocator.c b/modules/codec/gstreamer/gstvlcpictureplaneallocator.c index 2029eb47a4..2245ee551a 100644 --- a/modules/codec/gstreamer/gstvlcpictureplaneallocator.c +++ b/modules/codec/gstreamer/gstvlcpictureplaneallocator.c @@ -42,9 +42,9 @@ static void gst_vlc_picture_plane_allocator_free( GstAllocator *p_allocator, GstMemory *p_gmem); static gpointer gst_vlc_picture_plane_map( GstMemory *p_gmem, gsize i_maxsize, GstMapFlags flags ); -static gboolean gst_vlc_picture_plane_unmap( GstVlcPicturePlane *p_mem ); +static void gst_vlc_picture_plane_unmap( GstMemory *p_mem ); static GstMemory* gst_vlc_picture_plane_copy( - GstVlcPicturePlane *p_mem, gssize i_offset, gssize i_size ); + GstMemory *p_mem, gssize i_offset, gssize i_size ); #define GST_VLC_PICTURE_PLANE_ALLOCATOR_NAME "vlcpictureplane" @@ -69,9 +69,9 @@ static void gst_vlc_picture_plane_allocator_init( GstAllocator *p_alloc = GST_ALLOCATOR_CAST( p_allocator ); p_alloc->mem_type = GST_VLC_PICTURE_PLANE_ALLOCATOR_NAME; - p_alloc->mem_map = (GstMemoryMapFunction) gst_vlc_picture_plane_map; - p_alloc->mem_unmap = (GstMemoryUnmapFunction) gst_vlc_picture_plane_unmap; - p_alloc->mem_copy = (GstMemoryShareFunction) gst_vlc_picture_plane_copy; + p_alloc->mem_map = gst_vlc_picture_plane_map; + p_alloc->mem_unmap = gst_vlc_picture_plane_unmap; + p_alloc->mem_copy = gst_vlc_picture_plane_copy; /* fallback is_span */ GST_OBJECT_FLAG_SET( p_allocator, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC ); @@ -116,15 +116,13 @@ static gpointer gst_vlc_picture_plane_map( GstMemory *p_gmem, return NULL; } -static gboolean gst_vlc_picture_plane_unmap( - GstVlcPicturePlane *p_mem ) +static void gst_vlc_picture_plane_unmap( GstMemory *p_mem ) { VLC_UNUSED( p_mem ); - return TRUE; } static GstMemory* gst_vlc_picture_plane_copy( - GstVlcPicturePlane *p_mem, gssize i_offset, gssize i_size ) + GstMemory *p_mem, gssize i_offset, gssize i_size ) { VLC_UNUSED( p_mem ); VLC_UNUSED( i_offset ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
