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
1b031a9c
Commit
1b031a9c
authored
May 18, 2004
by
Eric Petit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/vout*: fixed a possible segfault on vout close
parent
d55a4d46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
modules/gui/macosx/vout.h
modules/gui/macosx/vout.h
+2
-1
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+10
-0
No files found.
modules/gui/macosx/vout.h
View file @
1b031a9c
...
@@ -67,9 +67,10 @@
...
@@ -67,9 +67,10 @@
int
initDone
;
int
initDone
;
}
}
-
(
id
)
initWithFrame
:
(
NSRect
)
frame
vout
:
(
vout_thread_t
*
)
p_vout
;
-
(
id
)
initWithFrame
:
(
NSRect
)
frame
vout
:
(
vout_thread_t
*
)
p_vout
;
-
(
void
)
initTextures
;
-
(
void
)
initTextures
;
-
(
void
)
reloadTexture
:
(
int
)
index
;
-
(
void
)
reloadTexture
:
(
int
)
index
;
-
(
void
)
cleanUp
;
@end
@end
...
...
modules/gui/macosx/vout.m
View file @
1b031a9c
...
@@ -455,6 +455,11 @@ void E_(CloseVideo) ( vlc_object_t *p_this )
...
@@ -455,6 +455,11 @@ void E_(CloseVideo) ( vlc_object_t *p_this )
{
{
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
p_this
;
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
p_this
;
if
(
p_vout
->
p_sys
->
i_opengl
)
{
[
p_vout
->
p_sys
->
o_glview
cleanUp
];
}
if
(
CoDestroyWindow
(
p_vout
)
)
if
(
CoDestroyWindow
(
p_vout
)
)
{
{
msg_Err
(
p_vout
,
"unable to destroy window"
);
msg_Err
(
p_vout
,
"unable to destroy window"
);
...
@@ -1588,6 +1593,11 @@ CATCH_MOUSE_EVENTS
...
@@ -1588,6 +1593,11 @@ CATCH_MOUSE_EVENTS
p_vout
->
p_sys
->
p_data
[
index
]
);
p_vout
->
p_sys
->
p_data
[
index
]
);
}
}
-
(
void
)
cleanUp
{
initDone
=
0
;
}
-
(
void
)
drawQuad
-
(
void
)
drawQuad
{
{
glBegin
(
GL_QUADS
);
glBegin
(
GL_QUADS
);
...
...
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