Skip to content
Snippets Groups Projects
Commit 33506d33 authored by Alexandre Janniaux's avatar Alexandre Janniaux Committed by Rémi Denis-Courmont
Browse files

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 f483bdc9.

Fixes #26122
parent b6407a66
No related branches found
No related tags found
1 merge request!666vlc_opengl: move device out of the union
Pipeline #141399 passed with stages
in 46 minutes and 34 seconds
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment