From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 06/13] lavc/libdav1d: fix exporting framerate
Date: Sun, 7 May 2023 15:32:48 +0200
Message-ID: <20230507133255.20881-6-anton@khirnov.net> (raw)
In-Reply-To: <20230507133255.20881-1-anton@khirnov.net>
Same issues as in the previous commit.
---
libavcodec/libdav1d.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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)
--
2.39.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-05-07 13:33 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-07 13:32 [FFmpeg-devel] [PATCH 01/13] lavu/frame: extend AVFrame.repeat_pict documentation Anton Khirnov
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 02/13] fftools/ffmpeg: fix computing video frame duration from repeat_pict Anton Khirnov
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 03/13] lavc/codec_desc: add a property for codecs that support field coding Anton Khirnov
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 04/13] lavf: use AV_CODEC_PROP_FIELDS where appropriate Anton Khirnov
2023-05-08 14:12 ` Michael Niedermayer
2023-05-09 8:37 ` [FFmpeg-devel] [PATCH v2 " Anton Khirnov
2023-05-08 14:15 ` [FFmpeg-devel] [PATCH " Michael Niedermayer
2023-05-09 8:44 ` Anton Khirnov
2023-05-15 18:59 ` Michael Niedermayer
2023-05-15 20:44 ` Anton Khirnov
2023-05-16 17:41 ` Michael Niedermayer
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 05/13] lavc/av1*: fix exporting framerate Anton Khirnov
2023-05-10 11:52 ` James Almer
2023-05-14 19:39 ` [FFmpeg-devel] [PATCH] " Anton Khirnov
2023-05-14 19:50 ` James Almer
2023-05-15 8:22 ` Anton Khirnov
2023-05-15 11:41 ` James Almer
2023-05-07 13:32 ` Anton Khirnov [this message]
2023-05-15 8:22 ` [FFmpeg-devel] [PATCH] lavc/libdav1d: " Anton Khirnov
2023-05-15 11:47 ` James Almer
2023-05-15 12:22 ` Anton Khirnov
2023-05-15 12:41 ` James Almer
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 07/13] lavc/ratecontrol: use AVCodecContext.framerate when available Anton Khirnov
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 08/13] lavc/msmpeg4enc: " Anton Khirnov
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 09/13] libaomenc: " Anton Khirnov
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 10/13] lavc/libkvazaar, libopenh264enc: drop redundant checks Anton Khirnov
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 11/13] lavc/libvpxenc: send frame durations to the encoder Anton Khirnov
2023-05-09 1:18 ` James Zern
2023-05-09 9:09 ` [FFmpeg-devel] [PATCH v2 " Anton Khirnov
2023-05-09 18:17 ` James Zern
2023-05-10 6:34 ` Anton Khirnov
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 12/13] lavc: deprecate AVCodecContext.ticks_per_frame Anton Khirnov
2023-05-07 13:32 ` [FFmpeg-devel] [PATCH 13/13] fftools/ffmpeg: stop using deprecated ticks_per_frame Anton Khirnov
2023-05-07 16:59 ` [FFmpeg-devel] [PATCH 01/13] lavu/frame: extend AVFrame.repeat_pict documentation Kieran Kunhya
2023-05-07 18:01 ` Anton Khirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230507133255.20881-6-anton@khirnov.net \
--to=anton@khirnov.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git