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
be37bd91
Commit
be37bd91
authored
Aug 06, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx vout: fix pool leaks
parent
50ddd739
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
modules/video_output/macosx.m
modules/video_output/macosx.m
+7
-3
No files found.
modules/video_output/macosx.m
View file @
be37bd91
...
@@ -346,8 +346,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
...
@@ -346,8 +346,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
id
o_window
=
[
sys
->
glView
window
];
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
return
VLC_SUCCESS
;
// this is okay, since the event will occur again when we have a window
}
NSSize
windowMinSize
=
[
o_window
minSize
];
NSSize
windowMinSize
=
[
o_window
minSize
];
...
@@ -368,10 +370,12 @@ static int Control (vout_display_t *vd, int query, va_list ap)
...
@@ -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
if
(
query
==
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
&&
is_forced
&&
(
cfg
->
display
.
width
!=
vd
->
cfg
->
display
.
width
&&
(
cfg
->
display
.
width
!=
vd
->
cfg
->
display
.
width
||
cfg
->
display
.
height
!=
vd
->
cfg
->
display
.
height
)
||
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
;
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 */
in the ui vout provider */
vout_display_cfg_t
cfg_tmp
=
*
cfg
;
vout_display_cfg_t
cfg_tmp
=
*
cfg
;
NSRect
bounds
;
NSRect
bounds
;
...
...
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