diff mbox series

[FFmpeg-devel,06/13] lavc/libdav1d: fix exporting framerate

Message ID 20230507133255.20881-6-anton@khirnov.net
State New
Headers show
Series [FFmpeg-devel,01/13] lavu/frame: extend AVFrame.repeat_pict documentation | expand

Checks

Context Check Description
andriy/configure_x86 warning Failed to apply patch

Commit Message

Anton Khirnov May 7, 2023, 1:32 p.m. UTC 
Same issues as in the previous commit.
---
 libavcodec/libdav1d.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index 87aed16749..19b6a880da 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -154,11 +154,11 @@  static void libdav1d_init_params(AVCodecContext *c, const Dav1dSequenceHeader *s
     else
         c->pix_fmt = pix_fmt[seq->layout][seq->hbd];
 
-    if (seq->num_units_in_tick && seq->time_scale) {
+    if (seq->num_units_in_tick && seq->time_scale &&
+        seq->num_ticks_per_picture < INT_MAX / seq->num_units_in_tick) {
         av_reduce(&c->framerate.den, &c->framerate.num,
-                  seq->num_units_in_tick, seq->time_scale, INT_MAX);
-        if (seq->equal_picture_interval)
-            c->ticks_per_frame = seq->num_ticks_per_picture;
+                  seq->num_units_in_tick * FFMAX(seq->num_ticks_per_picture, 1),
+                  seq->time_scale, INT_MAX);
     }
 
    if (seq->film_grain_present)