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
9715ca47
Commit
9715ca47
authored
Aug 23, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly handle input state in InputSourceInit.
parent
dc06ad9f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
src/input/input.c
src/input/input.c
+8
-3
No files found.
src/input/input.c
View file @
9715ca47
...
@@ -2070,6 +2070,8 @@ static int InputSourceInit( input_thread_t *p_input,
...
@@ -2070,6 +2070,8 @@ static int InputSourceInit( input_thread_t *p_input,
input_source_t
*
in
,
const
char
*
psz_mrl
,
input_source_t
*
in
,
const
char
*
psz_mrl
,
const
char
*
psz_forced_demux
)
const
char
*
psz_forced_demux
)
{
{
const
bool
b_master
=
in
==
&
p_input
->
p
->
input
;
char
psz_dup
[
strlen
(
psz_mrl
)
+
1
];
char
psz_dup
[
strlen
(
psz_mrl
)
+
1
];
const
char
*
psz_access
;
const
char
*
psz_access
;
const
char
*
psz_demux
;
const
char
*
psz_demux
;
...
@@ -2190,6 +2192,7 @@ static int InputSourceInit( input_thread_t *p_input,
...
@@ -2190,6 +2192,7 @@ static int InputSourceInit( input_thread_t *p_input,
{
{
int64_t
i_pts_delay
;
int64_t
i_pts_delay
;
if
(
b_master
)
input_ChangeState
(
p_input
,
OPENING_S
);
input_ChangeState
(
p_input
,
OPENING_S
);
/* Now try a real access */
/* Now try a real access */
...
@@ -2268,6 +2271,7 @@ static int InputSourceInit( input_thread_t *p_input,
...
@@ -2268,6 +2271,7 @@ static int InputSourceInit( input_thread_t *p_input,
var_Set
(
p_input
,
"seekable"
,
val
);
var_Set
(
p_input
,
"seekable"
,
val
);
}
}
if
(
b_master
)
input_ChangeState
(
p_input
,
BUFFERING_S
);
input_ChangeState
(
p_input
,
BUFFERING_S
);
/* Create the stream_t */
/* Create the stream_t */
...
@@ -2360,6 +2364,7 @@ static int InputSourceInit( input_thread_t *p_input,
...
@@ -2360,6 +2364,7 @@ static int InputSourceInit( input_thread_t *p_input,
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
error:
error:
if
(
b_master
)
input_ChangeState
(
p_input
,
ERROR_S
);
input_ChangeState
(
p_input
,
ERROR_S
);
if
(
in
->
p_demux
)
if
(
in
->
p_demux
)
...
...
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