[vlc-commits] vdpau/chroma: do not get early picture for context

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec 22 00:04:29 2018 +0200| [1d0ca802fe30c7b2a8a7423ea2a89aaa28b1cabd] | committer: Rémi Denis-Courmont

vdpau/chroma: do not get early picture for context

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d0ca802fe30c7b2a8a7423ea2a89aaa28b1cabd
---

 modules/hw/vdpau/chroma.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/hw/vdpau/chroma.c b/modules/hw/vdpau/chroma.c
index af47b034c5..a3cd998424 100644
--- a/modules/hw/vdpau/chroma.c
+++ b/modules/hw/vdpau/chroma.c
@@ -751,18 +751,10 @@ static int OutputOpen(vlc_object_t *obj)
     else
         return VLC_EGENERIC;
 
-    /* Get the context and allocate the mixer (through *ahem* picture) */
-    picture_t *pic = filter_NewPicture(filter);
-    if (pic == NULL)
+    VdpStatus err = vdp_get_x11(NULL, -1, &sys->vdp, &sys->device);
+    if (err != VDP_STATUS_OK)
         return VLC_EGENERIC;
 
-    vlc_vdp_output_surface_t *picsys = pic->p_sys;
-    assert(picsys != NULL && picsys->vdp != NULL);
-
-    sys->vdp = vdp_hold_x11(picsys->vdp, NULL);
-    sys->device = picsys->device;
-    picture_Release(pic);
-
     sys->mixer = MixerCreate(filter, video_filter == YCbCrRender);
     if (sys->mixer == VDP_INVALID_HANDLE)
     {