diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-20 22:53:00 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-21 20:21:12 -0300 |
| commit | a1ad585c8ef1ec2f00f70ada99af0c67834fd23c (patch) | |
| tree | 0f033129711f70cae5c0d7330d4ec0cad75e106e /libavformat | |
| parent | 31e65eb84d6d1cce2feea1147650a78dc56936c4 (diff) | |
| download | ffmpeg-a1ad585c8ef1ec2f00f70ada99af0c67834fd23c.tar.gz | |
avformat/apng: fix setting frame delay when max_fps is set to no limit
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 874eb012f75bc18bb6d79ad4bc0912afa21751f3)
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/apngdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index 84298aecfd..4b506ddb77 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -269,7 +269,7 @@ static int decode_fctl_chunk(AVFormatContext *s, APNGDemuxContext *ctx, AVPacket /* default is hundredths of seconds */ if (!delay_den) delay_den = 100; - if (!delay_num || delay_den / delay_num > ctx->max_fps) { + if (!delay_num || (ctx->max_fps && delay_den / delay_num > ctx->max_fps)) { delay_num = 1; delay_den = ctx->default_fps; } |