From 2607d6e41997e4420894531c6f523c92e7e6d195 Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini Date: Wed, 13 Aug 2014 17:51:07 +0200 Subject: vdpau: correctly mark invalid mixer as such on vdp_video_mixer_create() failure Otherwise vdp_video_mixer_destroy() would later fail when called on an invalid video mixer handle. With mesa r600 vdpau driver, this would cause a segfault. --- video/vdpau_mixer.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'video/vdpau_mixer.c') diff --git a/video/vdpau_mixer.c b/video/vdpau_mixer.c index 88509ea833..1112cb0de3 100644 --- a/video/vdpau_mixer.c +++ b/video/vdpau_mixer.c @@ -170,6 +170,9 @@ static int create_vdp_mixer(struct mp_vdpau_mixer *mixer) VDP_NUM_MIXER_PARAMETER, parameters, parameter_values, &mixer->video_mixer); + if (vdp_st != VDP_STATUS_OK) + mixer->video_mixer = VDP_INVALID_HANDLE; + CHECK_VDP_ERROR(mixer, "Error when calling vdp_video_mixer_create"); mixer->initialized = true; -- cgit v1.2.3