Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
3b37b675
Commit
3b37b675
authored
Mar 25, 2007
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small fix.
parent
f5bcfe6d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
18 deletions
+5
-18
src/video_output/video_output.c
src/video_output/video_output.c
+5
-18
No files found.
src/video_output/video_output.c
View file @
3b37b675
...
@@ -228,7 +228,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
...
@@ -228,7 +228,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
vout_thread_t
*
p_vout
;
/* thread descriptor */
vout_thread_t
*
p_vout
;
/* thread descriptor */
input_thread_t
*
p_input_thread
;
input_thread_t
*
p_input_thread
;
int
i_index
;
/* loop variable */
int
i_index
;
/* loop variable */
char
*
psz_plugin
=
NULL
;
vlc_value_t
val
,
text
;
vlc_value_t
val
,
text
;
unsigned
int
i_width
=
p_fmt
->
i_width
;
unsigned
int
i_width
=
p_fmt
->
i_width
;
...
@@ -354,6 +353,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
...
@@ -354,6 +353,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
/* continue the parent's filter chain */
/* continue the parent's filter chain */
char
*
psz_end
;
char
*
psz_end
;
/* FIXME: use config_ChainParse */
psz_end
=
strchr
(
((
vout_thread_t
*
)
p_parent
)
->
psz_filter_chain
,
':'
);
psz_end
=
strchr
(
((
vout_thread_t
*
)
p_parent
)
->
psz_filter_chain
,
':'
);
if
(
psz_end
&&
*
(
psz_end
+
1
)
)
if
(
psz_end
&&
*
(
psz_end
+
1
)
)
p_vout
->
psz_filter_chain
=
strdup
(
psz_end
+
1
);
p_vout
->
psz_filter_chain
=
strdup
(
psz_end
+
1
);
...
@@ -373,34 +373,21 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
...
@@ -373,34 +373,21 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
{
{
var_Create
(
p_vout
,
"vout"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_vout
,
"vout"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Get
(
p_vout
,
"vout"
,
&
val
);
var_Get
(
p_vout
,
"vout"
,
&
val
);
psz_p
lugin
=
val
.
psz_string
;
psz_p
arser
=
val
.
psz_string
;
}
}
#if 0
else
else
{
{
/* the filter chain is a string list of filters separated by double
psz_parser
=
strdup
(
p_vout
->
psz_filter_chain
);
* colons */
char *psz_end;
psz_end = strchr( p_vout->psz_filter_chain, ':' );
if( psz_end )
psz_plugin = strndup( p_vout->psz_filter_chain,
psz_end - p_vout->psz_filter_chain );
else psz_plugin = strdup( p_vout->psz_filter_chain );
}
}
#endif
/* Create the vout thread */
/* Create the vout thread */
psz_parser
=
p_vout
->
psz_filter_chain
;
config_ChainCreate
(
&
psz_name
,
&
p_cfg
,
psz_parser
);
printf
(
"psz_parser: %s
\n
"
,
psz_parser
);
free
(
psz_parser
);
psz_parser
=
config_ChainCreate
(
&
psz_name
,
&
p_cfg
,
psz_parser
);
printf
(
"psz_parser: %s
\n
"
,
psz_parser
);
p_vout
->
p_cfg
=
p_cfg
;
p_vout
->
p_cfg
=
p_cfg
;
p_vout
->
p_module
=
module_Need
(
p_vout
,
p_vout
->
p_module
=
module_Need
(
p_vout
,
(
p_vout
->
psz_filter_chain
&&
*
p_vout
->
psz_filter_chain
)
?
(
p_vout
->
psz_filter_chain
&&
*
p_vout
->
psz_filter_chain
)
?
"video filter"
:
"video output"
,
psz_name
,
0
);
"video filter"
:
"video output"
,
psz_name
,
0
);
if
(
psz_plugin
)
free
(
psz_plugin
);
if
(
p_vout
->
p_module
==
NULL
)
if
(
p_vout
->
p_module
==
NULL
)
{
{
msg_Err
(
p_vout
,
"no suitable vout module"
);
msg_Err
(
p_vout
,
"no suitable vout module"
);
...
...
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