[Bf-blender-cvs] [440c29f65b7] blender-v3.3-release: Fix T100771: Incorrect strip length when timecodes are used
Richard Antalik
noreply at git.blender.org
Wed Sep 21 14:27:10 CEST 2022
Commit: 440c29f65b7f85190376811a5c10258e35cf2d60
Author: Richard Antalik
Date: Tue Sep 13 20:29:12 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB440c29f65b7f85190376811a5c10258e35cf2d60
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
===================================================================
M source/blender/imbuf/intern/indexer.c
===================================================================
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) {
More information about the Bf-blender-cvs
mailing list