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
2ce82a3f
Commit
2ce82a3f
authored
Apr 19, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
visual: remove non-sensical code
This mostly reverts commit
fc5156cc
. This also fixes a use-after-free bug.
parent
ebbe5a5f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
19 deletions
+1
-19
modules/visualization/visual/visual.c
modules/visualization/visual/visual.c
+1
-17
modules/visualization/visual/visual.h
modules/visualization/visual/visual.h
+0
-2
No files found.
modules/visualization/visual/visual.c
View file @
2ce82a3f
...
...
@@ -192,8 +192,6 @@ static int Open( vlc_object_t *p_this )
if
(
(
p_sys
->
i_height
%
2
)
!=
0
)
p_sys
->
i_height
--
;
if
(
(
p_sys
->
i_width
%
2
)
!=
0
)
p_sys
->
i_width
--
;
vlc_mutex_init
(
&
p_sys
->
lock
);
p_sys
->
b_close
=
false
;
p_sys
->
i_effect
=
0
;
p_sys
->
effect
=
NULL
;
...
...
@@ -321,16 +319,8 @@ static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
picture_t
*
p_outpic
;
/* First, get a new picture */
do
{
vlc_mutex_lock
(
&
p_sys
->
lock
);
bool
close
=
p_sys
->
b_close
;
vlc_mutex_unlock
(
&
p_sys
->
lock
);
if
(
close
)
return
NULL
;
while
(
(
p_outpic
=
vout_GetPicture
(
p_sys
->
p_vout
)
)
==
NULL
)
msleep
(
VOUT_OUTMEM_SLEEP
);
}
while
(
(
p_outpic
=
vout_GetPicture
(
p_sys
->
p_vout
)
)
==
NULL
);
/* Blank the picture */
for
(
int
i
=
0
;
i
<
p_outpic
->
i_planes
;
i
++
)
...
...
@@ -365,10 +355,6 @@ static void Close( vlc_object_t *p_this )
filter_t
*
p_filter
=
(
filter_t
*
)
p_this
;
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
vlc_mutex_lock
(
&
p_sys
->
lock
);
p_sys
->
b_close
=
true
;
vlc_mutex_unlock
(
&
p_sys
->
lock
);
if
(
p_filter
->
p_sys
->
p_vout
)
{
aout_filter_RequestVout
(
p_filter
,
p_filter
->
p_sys
->
p_vout
,
0
);
...
...
@@ -402,6 +388,4 @@ static void Close( vlc_object_t *p_this )
free
(
p_sys
->
effect
);
free
(
p_filter
->
p_sys
);
vlc_mutex_destroy
(
&
p_sys
->
lock
);
}
modules/visualization/visual/visual.h
View file @
2ce82a3f
...
...
@@ -64,8 +64,6 @@ typedef struct
struct
filter_sys_t
{
vout_thread_t
*
p_vout
;
vlc_mutex_t
lock
;
bool
b_close
;
int
i_width
;
int
i_height
;
...
...
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