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
9dbfc5eb
Commit
9dbfc5eb
authored
Jun 08, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xvideo: do not pretend that the video window was resized (refs #8696)
parent
22b6f35c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
12 deletions
+6
-12
modules/video_output/xcb/xvideo.c
modules/video_output/xcb/xvideo.c
+6
-12
No files found.
modules/video_output/xcb/xvideo.c
View file @
9dbfc5eb
...
...
@@ -773,7 +773,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
{
const
vout_display_cfg_t
*
cfg
;
const
video_format_t
*
source
;
bool
is_forced
=
false
;
if
(
query
==
VOUT_DISPLAY_CHANGE_SOURCE_ASPECT
||
query
==
VOUT_DISPLAY_CHANGE_SOURCE_CROP
)
...
...
@@ -785,19 +784,14 @@ static int Control (vout_display_t *vd, int query, va_list ap)
{
source
=
&
vd
->
source
;
cfg
=
(
const
vout_display_cfg_t
*
)
va_arg
(
ap
,
const
vout_display_cfg_t
*
);
if
(
query
==
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
)
is_forced
=
(
bool
)
va_arg
(
ap
,
int
);
}
/* */
if
(
query
==
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
&&
is_forced
&&
(
cfg
->
display
.
width
!=
vd
->
cfg
->
display
.
width
||
cfg
->
display
.
height
!=
vd
->
cfg
->
display
.
height
)
&&
vout_window_SetSize
(
p_sys
->
embed
,
cfg
->
display
.
width
,
cfg
->
display
.
height
))
return
VLC_EGENERIC
;
if
(
query
==
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
&&
va_arg
(
ap
,
int
))
{
vout_window_SetSize
(
p_sys
->
embed
,
cfg
->
display
.
width
,
cfg
->
display
.
height
);
return
VLC_EGENERIC
;
/* Always fail. See x11.c for rationale. */
}
vout_display_place_t
place
;
vout_display_PlacePicture
(
&
place
,
source
,
cfg
,
false
);
...
...
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