Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits:
33506d33 by Alexandre Janniaux at 2021-09-24T18:30:36+00:00
vlc_opengl: move device out of the union
The device needs to be released in the offscreen implementation case but
it's not possible to differentiate with the on-screen implementation
that gets the window provided. Having the device available everywhere is
easier than providing callbacks to allocate the device for now.
Fix NULL dereference with window for on-screen implementation.
Regression from f483bdc91951208a3875da6e8a6fa0059a6d5aa8.
Fixes #26122
- - - - -
1 changed file:
- include/vlc_opengl.h
Changes:
=====================================
include/vlc_opengl.h
=====================================
@@ -52,6 +52,7 @@ struct vlc_gl_t
module_t *module;
void *sys;
+ struct vlc_decoder_device *device;
union {
struct { /* on-screen */
void (*swap)(vlc_gl_t *);
@@ -61,7 +62,6 @@ struct vlc_gl_t
struct { /* off-screen */
picture_t *(*swap_offscreen)(vlc_gl_t *);
- struct vlc_decoder_device *device;
vlc_fourcc_t offscreen_chroma_out;
struct vlc_video_context *offscreen_vctx_out;
/* Flag to indicate if the OpenGL implementation produces
upside-down
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/33506d3314c04a03286712af8dd4e14434eb19e7
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/33506d3314c04a03286712af8dd4e14434eb19e7
You're receiving this email because of your account on code.videolan.org.
_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
