Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
2c6a375e
Commit
2c6a375e
authored
Dec 04, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up.
parent
31715344
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
11 deletions
+3
-11
src/input/input.c
src/input/input.c
+3
-11
No files found.
src/input/input.c
View file @
2c6a375e
...
...
@@ -1080,7 +1080,7 @@ static void LoadSlaves( input_thread_t *p_input )
msg_Dbg
(
p_input
,
"adding slave input '%s'"
,
psz
);
input_source_t
*
p_slave
=
InputSourceNew
(
p_input
);
if
(
!
InputSourceInit
(
p_input
,
p_slave
,
psz
,
NULL
)
)
if
(
p_slave
&&
!
InputSourceInit
(
p_input
,
p_slave
,
psz
,
NULL
)
)
TAB_APPEND
(
p_input
->
p
->
i_slave
,
p_input
->
p
->
slave
,
p_slave
);
else
free
(
p_slave
);
...
...
@@ -2032,7 +2032,7 @@ static bool Control( input_thread_t *p_input, int i_type,
{
input_source_t
*
slave
=
InputSourceNew
(
p_input
);
if
(
!
InputSourceInit
(
p_input
,
slave
,
val
.
psz_string
,
NULL
)
)
if
(
slave
&&
!
InputSourceInit
(
p_input
,
slave
,
val
.
psz_string
,
NULL
)
)
{
vlc_meta_t
*
p_meta
;
int64_t
i_time
;
...
...
@@ -2322,8 +2322,6 @@ static int InputSourceInit( input_thread_t *p_input,
input_source_t
*
in
,
const
char
*
psz_mrl
,
const
char
*
psz_forced_demux
)
{
const
bool
b_master
=
in
==
&
p_input
->
p
->
input
;
char
psz_dup
[
strlen
(
psz_mrl
)
+
1
];
const
char
*
psz_access
;
const
char
*
psz_demux
;
...
...
@@ -2335,9 +2333,6 @@ static int InputSourceInit( input_thread_t *p_input,
strcpy
(
psz_dup
,
psz_mrl
);
if
(
!
in
)
return
VLC_EGENERIC
;
if
(
!
p_input
)
return
VLC_EGENERIC
;
/* Split uri */
input_SplitMRL
(
&
psz_access
,
&
psz_demux
,
&
psz_path
,
psz_dup
);
...
...
@@ -2637,9 +2632,6 @@ static int InputSourceInit( input_thread_t *p_input,
return
VLC_SUCCESS
;
error:
if
(
b_master
)
input_ChangeState
(
p_input
,
ERROR_S
);
if
(
in
->
p_demux
)
demux_Delete
(
in
->
p_demux
);
...
...
@@ -3142,7 +3134,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for
var_Change
(
p_input
,
"spu-es"
,
VLC_VAR_CHOICESCOUNT
,
&
count
,
NULL
);
sub
=
InputSourceNew
(
p_input
);
if
(
InputSourceInit
(
p_input
,
sub
,
psz_subtitle
,
"subtitle"
)
)
if
(
!
sub
||
InputSourceInit
(
p_input
,
sub
,
psz_subtitle
,
"subtitle"
)
)
{
free
(
sub
);
return
;
...
...
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