Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
90554602
Commit
90554602
authored
Sep 21, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly set order per subtitle decoder.
parent
16d54c3d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
src/input/decoder.c
src/input/decoder.c
+4
-0
No files found.
src/input/decoder.c
View file @
90554602
...
@@ -80,6 +80,7 @@ struct decoder_owner_sys_t
...
@@ -80,6 +80,7 @@ struct decoder_owner_sys_t
vout_thread_t
*
p_spu_vout
;
vout_thread_t
*
p_spu_vout
;
int
i_spu_channel
;
int
i_spu_channel
;
int64_t
i_spu_order
;
sout_instance_t
*
p_sout
;
sout_instance_t
*
p_sout
;
sout_packetizer_input_t
*
p_sout_input
;
sout_packetizer_input_t
*
p_sout_input
;
...
@@ -476,6 +477,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
...
@@ -476,6 +477,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
p_dec
->
p_owner
->
p_vout
=
NULL
;
p_dec
->
p_owner
->
p_vout
=
NULL
;
p_dec
->
p_owner
->
p_spu_vout
=
NULL
;
p_dec
->
p_owner
->
p_spu_vout
=
NULL
;
p_dec
->
p_owner
->
i_spu_channel
=
0
;
p_dec
->
p_owner
->
i_spu_channel
=
0
;
p_dec
->
p_owner
->
i_spu_order
=
0
;
p_dec
->
p_owner
->
p_sout
=
p_sout
;
p_dec
->
p_owner
->
p_sout
=
p_sout
;
p_dec
->
p_owner
->
p_sout_input
=
NULL
;
p_dec
->
p_owner
->
p_sout_input
=
NULL
;
p_dec
->
p_owner
->
p_packetizer
=
NULL
;
p_dec
->
p_owner
->
p_packetizer
=
NULL
;
...
@@ -1454,6 +1456,7 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec )
...
@@ -1454,6 +1456,7 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec )
{
{
spu_Control
(
p_vout
->
p_spu
,
SPU_CHANNEL_REGISTER
,
spu_Control
(
p_vout
->
p_spu
,
SPU_CHANNEL_REGISTER
,
&
p_sys
->
i_spu_channel
);
&
p_sys
->
i_spu_channel
);
p_sys
->
i_spu_order
=
0
;
p_sys
->
p_spu_vout
=
p_vout
;
p_sys
->
p_spu_vout
=
p_vout
;
}
}
...
@@ -1461,6 +1464,7 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec )
...
@@ -1461,6 +1464,7 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec )
if
(
p_subpic
)
if
(
p_subpic
)
{
{
p_subpic
->
i_channel
=
p_sys
->
i_spu_channel
;
p_subpic
->
i_channel
=
p_sys
->
i_spu_channel
;
p_subpic
->
i_order
=
p_sys
->
i_spu_order
++
;
p_subpic
->
b_subtitle
=
true
;
p_subpic
->
b_subtitle
=
true
;
}
}
...
...
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