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
9cb64209
Commit
9cb64209
authored
Jul 25, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XCB/X11: do not corrupt video format in case of probing failure
parent
3012f5e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
modules/video_output/xcb/x11.c
modules/video_output/xcb/x11.c
+3
-2
No files found.
modules/video_output/xcb/x11.c
View file @
9cb64209
...
...
@@ -126,6 +126,7 @@ static int Open (vlc_object_t *obj)
const
xcb_setup_t
*
setup
=
xcb_get_setup
(
conn
);
/* Determine our pixel format */
video_format_t
fmt_pic
;
xcb_visualid_t
vid
;
sys
->
depth
=
0
;
...
...
@@ -137,7 +138,7 @@ static int Open (vlc_object_t *obj)
if
(
fmt
->
depth
<=
sys
->
depth
)
continue
;
/* no better than earlier format */
video_format_t
fmt_pic
=
vd
->
fmt
;
fmt_pic
=
vd
->
fmt
;
/* Check that the pixmap format is supported by VLC. */
switch
(
fmt
->
depth
)
...
...
@@ -206,7 +207,6 @@ static int Open (vlc_object_t *obj)
fmt_pic
.
i_gmask
=
vt
->
green_mask
;
fmt_pic
.
i_bmask
=
vt
->
blue_mask
;
found_visual:
vd
->
fmt
=
fmt_pic
;
vid
=
vt
->
visual_id
;
msg_Dbg
(
vd
,
"using X11 visual ID 0x%"
PRIx32
,
vid
);
sys
->
depth
=
fmt
->
depth
;
...
...
@@ -305,6 +305,7 @@ found_format:;
vd
->
info
.
has_pictures_invalid
=
true
;
vd
->
info
.
has_event_thread
=
true
;
vd
->
fmt
=
fmt_pic
;
vd
->
pool
=
Pool
;
vd
->
prepare
=
NULL
;
vd
->
display
=
Display
;
...
...
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