Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
d7644d8d
Commit
d7644d8d
authored
Mar 25, 2007
by
dionoea
Browse files
Remove last call to strchr( , ':' ) and fix a small memleak.
parent
57eba9e1
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/video_output/video_output.c
View file @
d7644d8d
...
...
@@ -351,13 +351,15 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
else
{
/* continue the parent's filter chain */
char
*
psz_
end
;
char
*
psz_
tmp
;
/* FIXME: use config_ChainParse */
psz_end
=
strchr
(
((
vout_thread_t
*
)
p_parent
)
->
psz_filter_chain
,
':'
);
if
(
psz_end
&&
*
(
psz_end
+
1
)
)
p_vout
->
psz_filter_chain
=
strdup
(
psz_end
+
1
);
else
p_vout
->
psz_filter_chain
=
NULL
;
/* Ugly hack to jump to our configuration chain */
p_vout
->
psz_filter_chain
=
((
vout_thread_t
*
)
p_parent
)
->
psz_filter_chain
;
p_vout
->
psz_filter_chain
=
config_ChainCreate
(
&
psz_tmp
,
&
p_cfg
,
p_vout
->
psz_filter_chain
);
config_ChainDestroy
(
p_cfg
);
free
(
psz_tmp
);
/* Create a video filter2 var ... but don't inherit values */
var_Create
(
p_vout
,
"video-filter"
,
VLC_VAR_STRING
);
...
...
@@ -387,6 +389,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
p_vout
->
p_module
=
module_Need
(
p_vout
,
(
p_vout
->
psz_filter_chain
&&
*
p_vout
->
psz_filter_chain
)
?
"video filter"
:
"video output"
,
psz_name
,
0
);
free
(
psz_name
);
if
(
p_vout
->
p_module
==
NULL
)
{
...
...
Write
Preview
Supports
Markdown
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