diff options
author | Sergey Sharybin <sergey@blender.org> | 2021-02-05 12:57:06 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2021-02-05 12:58:44 +0300 |
commit | b6921506c957c9384c4c7ba6af00db1c88052d0a (patch) | |
tree | 56f780db2431b55b09ae9da6c2d3215a1f4f257a /source/blender/imbuf | |
parent | 600625794d426a55289d68c1ba5f659fba0858f5 (diff) |
Fix integer types in ImBuf leading to warnings
Replace `long long` with an explicit `int64_t`. This is also what is
used in the FFmpeg headers.
Fixes clang diagnostics warning about wrong format used in the log.
Should be no functional changes.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index c40e65b1c5c..3a7570cd320 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -1050,7 +1050,7 @@ static ImBuf *ffmpeg_fetchibuf(struct anim *anim, int position, IMB_Timecode_Typ int64_t pts_to_search = 0; double frame_rate; double pts_time_base; - long long st_time; + int64_t st_time; struct anim_index *tc_index = 0; AVStream *v_st; int new_frame_index = 0; /* To quiet gcc barking... */ @@ -1121,7 +1121,7 @@ static ImBuf *ffmpeg_fetchibuf(struct anim *anim, int position, IMB_Timecode_Typ ffmpeg_decode_video_frame_scan(anim, pts_to_search); } else if (position != anim->curposition + 1) { - long long pos; + int64_t pos; int ret; if (tc_index) { @@ -1145,7 +1145,7 @@ static ImBuf *ffmpeg_fetchibuf(struct anim *anim, int position, IMB_Timecode_Typ } } else { - pos = (long long)(position - anim->preseek) * AV_TIME_BASE / frame_rate; + pos = (int64_t)(position - anim->preseek) * AV_TIME_BASE / frame_rate; av_log(anim->pFormatCtx, AV_LOG_DEBUG, |