Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
be37bd91
Commit
be37bd91
authored
Aug 06, 2013
by
David Fuhrmann
Browse files
macosx vout: fix pool leaks
parent
50ddd739
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/video_output/macosx.m
View file @
be37bd91
...
...
@@ -346,8 +346,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
id
o_window
=
[
sys
->
glView
window
];
if
(
!
o_window
)
if
(
!
o_window
)
{
[
o_pool
release
];
return
VLC_SUCCESS
;
// this is okay, since the event will occur again when we have a window
}
NSSize
windowMinSize
=
[
o_window
minSize
];
...
...
@@ -368,10 +370,12 @@ static int Control (vout_display_t *vd, int query, va_list ap)
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
(
sys
->
embed
,
cfg
->
display
.
width
,
cfg
->
display
.
height
))
&&
vout_window_SetSize
(
sys
->
embed
,
cfg
->
display
.
width
,
cfg
->
display
.
height
))
{
[
o_pool
release
];
return
VLC_EGENERIC
;
}
/* we always use our current frame here, because we have some size constraints
/* we always use our current frame here, because we have some size constraints
in the ui vout provider */
vout_display_cfg_t
cfg_tmp
=
*
cfg
;
NSRect
bounds
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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