diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 25fc310bd359859202793c65f0ecd98a381761ab..70d85b0b0cc5e29bf27a68dc02def5a44ba614e8 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -137,7 +137,7 @@ static int Open (vlc_object_t *obj)
         goto error;
 
     /* Initialize video display */
-    sys->vgl = vout_display_opengl_New (&vd->fmt, sys->gl);
+    sys->vgl = vout_display_opengl_New (&vd->fmt, NULL, sys->gl);
     if (!sys->vgl)
         goto error;
 
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index e2963483fd5d612926d082aa4f199c4105b34c1f..d49aed2f094a9b1e7ed82f3bff66464efd9aff97 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -151,7 +151,7 @@ static int Open(vlc_object_t *this)
 	sys->gl.getProcAddress = NULL;
     sys->gl.sys = sys;
 
-	sys->vgl = vout_display_opengl_New(&vd->fmt, &sys->gl);
+	sys->vgl = vout_display_opengl_New(&vd->fmt, NULL, &sys->gl);
 	if (!sys->vgl)
     {
         sys->gl.sys = NULL;
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index c218d35035f742b0e61880e2bfbfa18e7683472e..920f1ed47391de526a77d61df5e03da0c44c2a12 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -190,7 +190,7 @@ static int Open(vlc_object_t *this)
     sys->gl.getProcAddress = NULL;
     sys->gl.sys = sys;
 
-	sys->vgl = vout_display_opengl_New(&vd->fmt, &sys->gl);
+	sys->vgl = vout_display_opengl_New(&vd->fmt, NULL, &sys->gl);
 	if (!sys->vgl)
     {
         sys->gl.sys = NULL;
diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 81e3198049017d68f9e19058a5483ffebebc9588..d3619a945e911662a6d81920cb6bbd132a2f153f 100644
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -116,7 +116,8 @@ static int Open(vlc_object_t *object)
     sys->gl.sys = vd;
 
     video_format_t fmt = vd->fmt;
-    sys->vgl = vout_display_opengl_New(&fmt, &sys->gl);
+    const vlc_fourcc_t *subpicture_chromas;
+    sys->vgl = vout_display_opengl_New(&fmt, &subpicture_chromas, &sys->gl);
     if (!sys->vgl)
         goto error;
 
@@ -125,6 +126,7 @@ static int Open(vlc_object_t *object)
     info.has_hide_mouse = false;
     info.has_pictures_invalid = true;
     info.has_event_thread = true;
+    info.subpicture_chromas = subpicture_chromas;
 
    /* Setup vout_display now that everything is fine */
     vd->fmt  = fmt;
diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 10d82b855466b2de7b2d04c004e5bc400bf2ec28..26cd383eca9467e145c299a1dea0877c53f0d05e 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -114,6 +114,7 @@ static inline int GetAlignedSize(unsigned size)
 }
 
 vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
+                                               const vlc_fourcc_t **subpicture_chromas,
                                                vlc_gl_t *gl)
 {
     vout_display_opengl_t *vgl = calloc(1, sizeof(*vgl));
@@ -336,6 +337,9 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     vgl->pool = NULL;
 
     *fmt = vgl->fmt;
+    if (subpicture_chromas) {
+        *subpicture_chromas = NULL;
+    }
     return vgl;
 }
 
diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index 3c9e984f7c33eaa2f90c39da22c13d8b3d766486..0704edb7231c3fe32da7bef5f3e289b400595113 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -58,7 +58,9 @@
 
 typedef struct vout_display_opengl_t vout_display_opengl_t;
 
-vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, vlc_gl_t *gl);
+vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
+                                               const vlc_fourcc_t **subpicture_chromas,
+                                               vlc_gl_t *gl);
 void vout_display_opengl_Delete(vout_display_opengl_t *vgl);
 
 picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned);
diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 6d61b1eddac8a582b57ff748acc514769b5139a8..53fc4525f194890f95bc4ee4b6798c16df415aa6 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -366,7 +366,8 @@ static int Open (vlc_object_t *obj)
     sys->gl.getProcAddress = GetProcAddress;
     sys->gl.sys = sys;
 
-    sys->vgl = vout_display_opengl_New (&vd->fmt, &sys->gl);
+    const vlc_fourcc_t *subpicture_chromas;
+    sys->vgl = vout_display_opengl_New (&vd->fmt, &subpicture_chromas, &sys->gl);
     if (!sys->vgl)
     {
         sys->gl.sys = NULL;
@@ -380,6 +381,7 @@ static int Open (vlc_object_t *obj)
     vout_display_info_t info = vd->info;
     info.has_pictures_invalid = false;
     info.has_event_thread = true;
+    info.subpicture_chromas = subpicture_chromas;
 
     /* Setup vout_display_t once everything is fine */
     vd->info = info;
@@ -477,7 +479,8 @@ static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *su
 
     vout_display_opengl_Display (sys->vgl, &vd->source);
     picture_Release (pic);
-    (void)subpicture;
+    if (subpicture)
+        subpicture_Delete(subpicture);
 }
 
 static int Control (vout_display_t *vd, int query, va_list ap)