Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
bfb2ff3f
Commit
bfb2ff3f
authored
Feb 15, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XCB/X11: validate scanline pad correctly
parent
7eaf9775
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
modules/video_output/xcb/x11.c
modules/video_output/xcb/x11.c
+5
-4
No files found.
modules/video_output/xcb/x11.c
View file @
bfb2ff3f
...
@@ -179,15 +179,16 @@ static int Open (vlc_object_t *obj)
...
@@ -179,15 +179,16 @@ static int Open (vlc_object_t *obj)
continue
;
continue
;
}
}
/* VLC pads lines to 16 pixels internally */
if
((
fmt
->
bits_per_pixel
<<
4
)
%
fmt
->
scanline_pad
)
continue
;
/* Byte sex is a non-issue for 8-bits. It can be worked around with
/* Byte sex is a non-issue for 8-bits. It can be worked around with
* RGB masks for 24-bits. Too bad for 15-bits and 16-bits. */
* RGB masks for 24-bits. Too bad for 15-bits and 16-bits. */
if
(
fmt
->
bits_per_pixel
==
16
&&
setup
->
image_byte_order
!=
ORDER
)
if
(
fmt
->
bits_per_pixel
==
16
&&
setup
->
image_byte_order
!=
ORDER
)
continue
;
continue
;
/* Make sure the X server is sane */
assert
(
fmt
->
bits_per_pixel
>
0
);
if
(
unlikely
(
fmt
->
scanline_pad
%
fmt
->
bits_per_pixel
))
continue
;
/* Check that the selected screen supports this depth */
/* Check that the selected screen supports this depth */
const
xcb_depth_t
*
d
=
FindDepth
(
scr
,
fmt
->
depth
);
const
xcb_depth_t
*
d
=
FindDepth
(
scr
,
fmt
->
depth
);
if
(
d
==
NULL
)
if
(
d
==
NULL
)
...
...
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