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
63bd1abd
Commit
63bd1abd
authored
Nov 30, 2006
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* fix commit [18178]
parent
3ea46905
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
13 deletions
+2
-13
modules/demux/subtitle.c
modules/demux/subtitle.c
+2
-13
No files found.
modules/demux/subtitle.c
View file @
63bd1abd
...
...
@@ -194,16 +194,9 @@ static int Open ( vlc_object_t *p_this )
p_sys
->
i_subtitle
=
0
;
p_sys
->
i_subtitles
=
0
;
p_sys
->
subtitle
=
NULL
;
p_sys
->
i_microsecperframe
=
0
;
p_sys
->
i_microsecperframe
=
4000
0
;
/* Get the FPS */
f_fps
=
var_CreateGetFloat
(
p_demux
,
"sub-fps"
);
if
(
f_fps
>=
1
.
0
)
{
p_sys
->
i_microsecperframe
=
(
int64_t
)(
(
float
)
1000000
/
f_fps
);
msg_Dbg
(
p_demux
,
"Override subtitle fps %f"
,
f_fps
);
}
p_input
=
(
input_thread_t
*
)
vlc_object_find
(
p_demux
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
if
(
p_input
)
{
...
...
@@ -220,6 +213,7 @@ static int Open ( vlc_object_t *p_this )
if
(
f_fps
>=
1
.
0
)
{
p_sys
->
i_microsecperframe
=
(
int64_t
)(
(
float
)
1000000
/
f_fps
);
msg_Dbg
(
p_demux
,
"Override subtitle fps %f"
,
f_fps
);
}
/* Get or probe the type */
...
...
@@ -710,11 +704,6 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle )
int
i_stop
;
unsigned
int
i
;
/* Try sub-fps value if set, movie rate if know, else 25fps (40000) */
int
i_microsecperframe
=
p_sys
->
i_original_mspf
>
0
?
p_sys
->
i_original_mspf
:
40000
;
if
(
p_sys
->
i_microsecperframe
>
0
)
i_microsecperframe
=
p_sys
->
i_microsecperframe
;
p_subtitle
->
i_start
=
0
;
p_subtitle
->
i_stop
=
0
;
p_subtitle
->
psz_text
=
NULL
;
...
...
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