summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-20 22:53:00 -0300
committerJames Almer <jamrial@gmail.com>2017-03-21 19:15:12 -0300
commit874eb012f75bc18bb6d79ad4bc0912afa21751f3 (patch)
tree6b4017b90f69a04b795b0edf17a924e3f59c4103 /libavformat
parentd8962ffbd8aaf9485d06eec045b022ba9c39692b (diff)
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>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/apngdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c
index bb17896ee5..7a284e32c2 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;
}