diff mbox

[FFmpeg-devel,1/2] avformat/apng: fix setting frame delay when max_fps is set to no limit

Message ID 20170321020323.6136-1-jamrial@gmail.com
State Accepted
Commit 874eb012f75bc18bb6d79ad4bc0912afa21751f3
Headers show

Commit Message

James Almer March 21, 2017, 2:03 a.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/apngdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer March 21, 2017, 12:45 p.m. UTC | #1 
On Mon, Mar 20, 2017 at 11:03:22PM -0300, James Almer wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/apngdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

LGTM
thx

[...]
James Almer March 21, 2017, 10:17 p.m. UTC | #2 
On 3/21/2017 9:45 AM, Michael Niedermayer wrote:
> On Mon, Mar 20, 2017 at 11:03:22PM -0300, James Almer wrote:
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavformat/apngdec.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> LGTM
> thx

Pushed.
diff mbox

Patch

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;
     }