Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
ffd1c3ee
Commit
ffd1c3ee
authored
Mar 28, 2016
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/utils: use pkt_timebase for legacy subtitles timing code
This is consistent with other AVSubtitle timing adjustments.
parent
d8620158
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
utils.c
libavcodec/utils.c
+5
-2
No files found.
libavcodec/utils.c
View file @
ffd1c3ee
...
@@ -2585,8 +2585,11 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
...
@@ -2585,8 +2585,11 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
#if FF_API_ASS_TIMING
#if FF_API_ASS_TIMING
if
(
avctx
->
sub_text_format
==
FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS
if
(
avctx
->
sub_text_format
==
FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS
&&
*
got_sub_ptr
&&
sub
->
num_rects
)
&&
*
got_sub_ptr
&&
sub
->
num_rects
)
{
ret
=
convert_sub_to_old_ass_form
(
sub
,
avpkt
,
avctx
->
time_base
);
const
AVRational
tb
=
avctx
->
pkt_timebase
.
num
?
avctx
->
pkt_timebase
:
avctx
->
time_base
;
ret
=
convert_sub_to_old_ass_form
(
sub
,
avpkt
,
tb
);
}
#endif
#endif
if
(
sub
->
num_rects
&&
!
sub
->
end_display_time
&&
avpkt
->
duration
&&
if
(
sub
->
num_rects
&&
!
sub
->
end_display_time
&&
avpkt
->
duration
&&
...
...
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