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
cc116115
Commit
cc116115
authored
Mar 21, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
es_out: do not start buffering when already buferring
This fixes an assertion failure. Regression from
62140018
.
parent
7a530806
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
src/input/decoder.c
src/input/decoder.c
+0
-2
src/input/es_out.c
src/input/es_out.c
+10
-7
No files found.
src/input/decoder.c
View file @
cc116115
...
@@ -533,8 +533,6 @@ void input_DecoderStartWait( decoder_t *p_dec )
...
@@ -533,8 +533,6 @@ void input_DecoderStartWait( decoder_t *p_dec )
assert
(
!
p_owner
->
b_waiting
);
assert
(
!
p_owner
->
b_waiting
);
input_DecoderFlush
(
p_dec
);
vlc_mutex_lock
(
&
p_owner
->
lock
);
vlc_mutex_lock
(
&
p_owner
->
lock
);
p_owner
->
b_first
=
true
;
p_owner
->
b_first
=
true
;
p_owner
->
b_has_data
=
false
;
p_owner
->
b_has_data
=
false
;
...
...
src/input/es_out.c
View file @
cc116115
...
@@ -573,13 +573,16 @@ static void EsOutChangePosition( es_out_t *out )
...
@@ -573,13 +573,16 @@ static void EsOutChangePosition( es_out_t *out )
{
{
es_out_id_t
*
p_es
=
p_sys
->
es
[
i
];
es_out_id_t
*
p_es
=
p_sys
->
es
[
i
];
if
(
!
p_es
->
p_dec
)
if
(
p_es
->
p_dec
!=
NULL
)
continue
;
{
input_DecoderFlush
(
p_es
->
p_dec
);
input_DecoderStartWait
(
p_es
->
p_dec
);
if
(
!
p_sys
->
b_buffering
)
{
if
(
p_es
->
p_dec_record
)
input_DecoderStartWait
(
p_es
->
p_dec
);
input_DecoderStartWait
(
p_es
->
p_dec_record
);
if
(
p_es
->
p_dec_record
!=
NULL
)
input_DecoderStartWait
(
p_es
->
p_dec_record
);
}
}
}
}
for
(
int
i
=
0
;
i
<
p_sys
->
i_pgrm
;
i
++
)
for
(
int
i
=
0
;
i
<
p_sys
->
i_pgrm
;
i
++
)
...
...
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