vlc | branch: master | Thomas Guillem <[email protected]> | Tue Jan 3 15:38:38 2017 +0100| [641fc44dc96bce89e375f09949548bbd25e19103] | committer: Thomas Guillem
vout/opengl: remove const modifer for picture_t This prevents converters to call picture_t functions like picture_Hold/picture_Release. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=641fc44dc96bce89e375f09949548bbd25e19103 --- modules/video_output/opengl/converter_android.c | 2 +- modules/video_output/opengl/converters.c | 2 +- modules/video_output/opengl/internal.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/video_output/opengl/converter_android.c b/modules/video_output/opengl/converter_android.c index 9298a1a..3435cc8 100644 --- a/modules/video_output/opengl/converter_android.c +++ b/modules/video_output/opengl/converter_android.c @@ -151,7 +151,7 @@ error: static int tc_anop_update(const opengl_tex_converter_t *tc, const GLuint *textures, unsigned width, unsigned height, - const picture_t *pic, const size_t *plane_offset) + picture_t *pic, const size_t *plane_offset) { (void) width; (void) height; (void) plane_offset; diff --git a/modules/video_output/opengl/converters.c b/modules/video_output/opengl/converters.c index 33abff2..8b6b4b4 100644 --- a/modules/video_output/opengl/converters.c +++ b/modules/video_output/opengl/converters.c @@ -151,7 +151,7 @@ upload_plane(const opengl_tex_converter_t *tc, static int tc_common_update(const opengl_tex_converter_t *tc, const GLuint *textures, unsigned width, unsigned height, - const picture_t *pic, const size_t *plane_offset) + picture_t *pic, const size_t *plane_offset) { int ret = VLC_SUCCESS; for (unsigned i = 0; i < tc->desc->plane_count && ret == VLC_SUCCESS; i++) diff --git a/modules/video_output/opengl/internal.h b/modules/video_output/opengl/internal.h index e65ff05..d925561 100644 --- a/modules/video_output/opengl/internal.h +++ b/modules/video_output/opengl/internal.h @@ -219,7 +219,7 @@ struct opengl_tex_converter_t */ int (*pf_update)(const opengl_tex_converter_t *fc, const GLuint *textures, unsigned width, unsigned height, - const picture_t *pic, const size_t *plane_offset); + picture_t *pic, const size_t *plane_offset); /* * Callback to prepare the fragment shader _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
