Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
45ab9b93
Commit
45ab9b93
authored
Dec 14, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XCB/XVideo: fix flawed logic for adaptor selection
parent
52707967
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
modules/video_output/xcb/xvideo.c
modules/video_output/xcb/xvideo.c
+4
-6
No files found.
modules/video_output/xcb/xvideo.c
View file @
45ab9b93
...
...
@@ -412,7 +412,8 @@ static int Open (vlc_object_t *obj)
if
(
adaptors
==
NULL
)
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
;
...
...
@@ -426,12 +427,9 @@ static int Open (vlc_object_t *obj)
const
xcb_xv_adaptor_info_t
*
a
=
it
.
data
;
char
*
name
;
if
(
forced_adaptor
!=
-
1
&&
forced_adaptor
!=
0
)
{
forced_adaptor
--
;
adaptor_current
++
;
if
(
adaptor_selected
!=
-
1
&&
adaptor_selected
!=
adaptor_current
)
continue
;
}
if
(
!
(
a
->
type
&
XCB_XV_TYPE_INPUT_MASK
)
||
!
(
a
->
type
&
XCB_XV_TYPE_IMAGE_MASK
))
continue
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment