Skip to content

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

XCB/XVideo: fix flawed logic for adaptor selection

parent 52707967
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
modules/video_output/xcb/xvideo.c
View file @ 45ab9b93
...@@ -412,7 +412,8 @@ static int Open (vlc_object_t *obj) ...@@ -412,7 +412,8 @@ static int Open (vlc_object_t *obj)
if (adaptors == NULL) if (adaptors == NULL)
goto error; goto error;
int forced_adaptor = var_InheritInteger (obj, "xvideo-adaptor"); int adaptor_selected = var_InheritInteger (obj, "xvideo-adaptor");
int adaptor_current = -1;
/* */ /* */
video_format_t fmt; video_format_t fmt;
...@@ -426,12 +427,9 @@ static int Open (vlc_object_t *obj) ...@@ -426,12 +427,9 @@ static int Open (vlc_object_t *obj)
const xcb_xv_adaptor_info_t *a = it.data; const xcb_xv_adaptor_info_t *a = it.data;
char *name; char *name;
if (forced_adaptor != -1 && forced_adaptor != 0) adaptor_current++;
{ if (adaptor_selected != -1 && adaptor_selected != adaptor_current)
forced_adaptor--;
continue; continue;
}
if (!(a->type & XCB_XV_TYPE_INPUT_MASK) if (!(a->type & XCB_XV_TYPE_INPUT_MASK)
|| !(a->type & XCB_XV_TYPE_IMAGE_MASK)) || !(a->type & XCB_XV_TYPE_IMAGE_MASK))
continue; continue;
......
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