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
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2019-06-30 22:48:03 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2019-06-30 22:49:10 +0300
commit35045b6135809f50df543b55bec1e936a954569f (patch)
tree891f31916e2d88306314ff7354e2582138b6f315 /source/blender/blenkernel/intern/writeffmpeg.c
parent789c6e94fb0dd711444a7cdd332291be979d5850 (diff)
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
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c2
1 files changed, 1 insertions, 1 deletions
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;