Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2022-09-13 21:29:12 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2022-09-21 13:40:01 +0300
commit440c29f65b7f85190376811a5c10258e35cf2d60 (patch)
treeb9578e5daed95bca7ba750a06b6b7373a7275b75 /source
parent42937493d8253a295a97092315288f961e8c6dba (diff)
Fix T100771: Incorrect strip length when timecodes are used
Some files have 2 different framerates stored in metadata. Use function `av_guess_frame_rate` to get media FPS, because it provides more consistent / correct values across multiple files. Reviewed By: sergey Differential Revision: https://developer.blender.org/D15839
Diffstat (limited to 'source')
-rw-r--r--source/blender/imbuf/intern/indexer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index 00396c01d99..a4f1f5e813a 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -1012,7 +1012,7 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context,
stream_size = avio_size(context->iFormatCtx->pb);
- context->frame_rate = av_q2d(context->iStream->r_frame_rate);
+ context->frame_rate = av_q2d(av_guess_frame_rate(context->iFormatCtx, context->iStream, NULL));
context->pts_time_base = av_q2d(context->iStream->time_base);
while (av_read_frame(context->iFormatCtx, next_packet) >= 0) {