[Bf-blender-cvs] [35045b61358] master: Fixed compiler warning
Sybren A. Stüvel
noreply at git.blender.org
Sun Jun 30 21:49:26 CEST 2019
Commit: 35045b6135809f50df543b55bec1e936a954569f
Author: Sybren A. Stüvel
Date: Sun Jun 30 21:48:03 2019 +0200
Branches: master
https://developer.blender.org/rB35045b6135809f50df543b55bec1e936a954569f
Fixed compiler warning
`(1L << 31)` can cause an integer overflow on 32-bit systems, `(1UL << 31)`
won't. Fixed as per LazyDodo's suggestion in
https://developer.blender.org/rB956cb4f403dd3a6ddb379202dc1f2770b9820073#238718
===================================================================
M source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 345d9ce1193..681c03e25b6 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -601,7 +601,7 @@ static AVStream *alloc_video_stream(FFMpegContext *context,
/* This calculates a fraction (DENUM_MAX / num) which approximates the scene frame rate
* (frs_sec / frs_sec_base). It uses the maximum denominator allowed by FFmpeg.
*/
- const double DENUM_MAX = (codec_id == AV_CODEC_ID_MPEG4) ? (1L << 16) - 1 : (1L << 31) - 1;
+ const double DENUM_MAX = (codec_id == AV_CODEC_ID_MPEG4) ? (1UL << 16) - 1 : (1UL << 31) - 1;
const double num = (DENUM_MAX / (double)rd->frs_sec) * rd->frs_sec_base;
c->time_base.den = (int)DENUM_MAX;
More information about the Bf-blender-cvs
mailing list