Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
5151a5d2
Commit
5151a5d2
authored
Dec 24, 2013
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "demux: ogg: don't recreate decoders on same chained streams."
This reverts commit
1f9c3427
.
parent
4a2c11ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
14 deletions
+6
-14
modules/demux/ogg.c
modules/demux/ogg.c
+5
-13
modules/demux/ogg.h
modules/demux/ogg.h
+1
-1
No files found.
modules/demux/ogg.c
View file @
5151a5d2
...
...
@@ -1296,9 +1296,9 @@ static void Ogg_DecodePacket( demux_t *p_demux,
p_block
->
i_buffer
=
0
;
}
if
(
p_stream
->
b_reusing
_with_other_fmt
)
if
(
p_stream
->
b_reusing
)
{
p_stream
->
b_reusing
_with_other_fmt
=
false
;
p_stream
->
b_reusing
=
false
;
p_block
->
i_flags
|=
BLOCK_FLAG_DISCONTINUITY
;
}
...
...
@@ -1872,19 +1872,13 @@ static void Ogg_CreateES( demux_t *p_demux )
p_stream
->
b_finished
=
false
;
p_stream
->
b_reinit
=
false
;
p_stream
->
b_initializing
=
false
;
p_stream
->
b_reusing
=
true
;
es_format_Copy
(
&
p_stream
->
fmt_old
,
&
p_old_stream
->
fmt
);
if
(
!
es_format_IsSimilar
(
&
p_stream
->
fmt_old
,
&
p_old_stream
->
fmt
)
)
{
msg_Dbg
(
p_demux
,
"recreating decoders using SET_FMT"
);
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_ES_FMT
,
p_stream
->
p_es
,
&
p_stream
->
fmt
);
p_stream
->
b_reusing_with_other_fmt
=
true
;
}
p_old_stream
->
p_es
=
NULL
;
p_old_stream
=
NULL
;
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_ES_FMT
,
p_stream
->
p_es
,
&
p_stream
->
fmt
);
}
else
{
...
...
@@ -1909,8 +1903,6 @@ static void Ogg_CreateES( demux_t *p_demux )
}
}
/****************************************************************************
* Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
* Elementary streams.
...
...
modules/demux/ogg.h
View file @
5151a5d2
...
...
@@ -75,7 +75,7 @@ typedef struct logical_stream_s
bool
b_initializing
;
bool
b_finished
;
bool
b_reinit
;
bool
b_reusing
_with_other_fmt
;
bool
b_reusing
;
bool
b_oggds
;
int
i_granule_shift
;
...
...
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