Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
ffmpeg2theora
Commits
417710ac
Commit
417710ac
authored
May 20, 2008
by
Jan Gerber
Browse files
handle broken srt files better
parent
7f866e8d
Changes
1
Hide whitespace changes
Inline
Side-by-side
ffmpeg2theora.c
View file @
417710ac
...
...
@@ -308,9 +308,7 @@ static int load_subtitles(ff2theora_kate_stream *this)
return
-
1
;
}
if
(
id
!=
last_seen_id
+
1
)
{
fprintf
(
stderr
,
"WARNING - Error: non consecutive ids: %s
\n
"
,
str
);
fclose
(
f
);
return
-
1
;
fprintf
(
stderr
,
"WARNING - non consecutive ids: %s - pretending not to have noticed
\n
"
,
str
);
}
last_seen_id
=
id
;
need
=
need_timing
;
...
...
@@ -1007,8 +1005,8 @@ void ff2theora_output(ff2theora this) {
for
(
i
=
0
;
i
<
this
->
n_kate_streams
;
++
i
)
{
ff2theora_kate_stream
*
ks
=
this
->
kate_streams
+
i
;
kate_info
*
ki
=
&
info
.
kate_streams
[
i
].
ki
;
kate_info_init
(
ki
);
if
(
ks
->
num_subtitles
>
0
)
{
kate_info_init
(
ki
);
kate_info_set_language
(
ki
,
ks
->
subtitles_language
);
kate_info_set_category
(
ki
,
ks
->
subtitles_category
[
0
]
?
ks
->
subtitles_category
:
"subtitles"
);
if
(
this
->
force_input_fps
)
{
...
...
@@ -1044,6 +1042,11 @@ void ff2theora_output(ff2theora this) {
ks
->
subtitles_count
++
;
}
}
else
{
ks
->
filename
=
NULL
;
ks
->
num_subtitles
=
0
;
ks
->
subtitles
=
NULL
;
}
}
if
(
info
.
audio_only
&&
(
this
->
end_time
>
0
||
this
->
start_time
>
0
)){
...
...
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