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
679cbd8f
Commit
679cbd8f
authored
Nov 21, 2018
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/concatdec: fix cur_dts based duration calculation with nonzero stream start_time
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
0a98622c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
concatdec.c
libavformat/concatdec.c
+1
-1
No files found.
libavformat/concatdec.c
View file @
679cbd8f
...
@@ -325,7 +325,7 @@ static int64_t get_best_effort_duration(ConcatFile *file, AVFormatContext *avf)
...
@@ -325,7 +325,7 @@ static int64_t get_best_effort_duration(ConcatFile *file, AVFormatContext *avf)
if
(
avf
->
duration
>
0
)
if
(
avf
->
duration
>
0
)
return
avf
->
duration
-
(
file
->
file_inpoint
-
file
->
file_start_time
);
return
avf
->
duration
-
(
file
->
file_inpoint
-
file
->
file_start_time
);
if
(
file
->
next_dts
!=
AV_NOPTS_VALUE
)
if
(
file
->
next_dts
!=
AV_NOPTS_VALUE
)
return
file
->
next_dts
-
(
file
->
file_inpoint
-
file
->
file_start_time
)
;
return
file
->
next_dts
-
file
->
file_inpoint
;
return
AV_NOPTS_VALUE
;
return
AV_NOPTS_VALUE
;
}
}
...
...
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