Skip to content

V
vlc-2-2
Commit 05e98ecf authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

vdpau/chroma: avoid cascading errors when mixer creation fails

parent dd4ad1f9
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/hw/vdpau/chroma.c
View file @ 05e98ecf
...@@ -197,9 +197,11 @@ static VdpVideoMixer MixerCreate(filter_t *filter) ...@@ -197,9 +197,11 @@ static VdpVideoMixer MixerCreate(filter_t *filter)
{ {
msg_Err(filter, "video %s %s failure: %s", "mixer", "creation", msg_Err(filter, "video %s %s failure: %s", "mixer", "creation",
vdp_get_error_string(sys->vdp, err)); vdp_get_error_string(sys->vdp, err));
mixer = VDP_INVALID_HANDLE; return VDP_INVALID_HANDLE;
} }
msg_Dbg(filter, "using video mixer %"PRIu32, mixer);
/* Set initial features and attributes */ /* Set initial features and attributes */
VdpVideoMixerAttribute attrv[3]; VdpVideoMixerAttribute attrv[3];
const void *valv[3]; const void *valv[3];
...@@ -305,7 +307,6 @@ static picture_t *OutputAllocate(filter_t *filter) ...@@ -305,7 +307,6 @@ static picture_t *OutputAllocate(filter_t *filter)
sys->mixer = MixerCreate(filter); sys->mixer = MixerCreate(filter);
if (sys->mixer == VDP_INVALID_HANDLE) if (sys->mixer == VDP_INVALID_HANDLE)
goto error; goto error;
msg_Dbg(filter, "using video mixer %"PRIu32, sys->mixer);
} }
return pic; return pic;
error: error:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment