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
4e20e949
Commit
4e20e949
authored
Nov 19, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: Check duration for overlap and clip in fps cfr/vfr code
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
c5092025
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
ffmpeg.c
ffmpeg.c
+7
-0
gif-disposal-restore
tests/ref/fate/gif-disposal-restore
+1
-1
No files found.
ffmpeg.c
View file @
4e20e949
...
...
@@ -904,6 +904,13 @@ static void do_video_out(AVFormatContext *s,
sync_ipts
=
next_picture
->
pts
;
delta0
=
sync_ipts
-
ost
->
sync_opts
;
delta
=
delta0
+
duration
;
if
(
delta0
<
0
&&
delta
>
0
)
{
double
cor
=
FFMIN
(
-
delta0
,
duration
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"Past duration %f too large
\n
"
,
-
delta0
);
sync_ipts
+=
cor
;
duration
-=
cor
;
delta0
+=
cor
;
}
/* by default, we output a single frame */
nb0_frames
=
0
;
...
...
tests/ref/fate/gif-disposal-restore
View file @
4e20e949
#tb 0: 1/1
0, 0, 0, 1, 112320, 0xb8afe429
0,
0, 0
, 1, 112320, 0xae588a4b
0,
1, 1
, 1, 112320, 0xae588a4b
0, 3, 3, 1, 112320, 0xccdd27b7
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