Skip to content

F
ffmpeg
Commit b0e1557f authored by Michael Bradshaw's avatar Michael Bradshaw Committed by Michael Niedermayer
Browse files
Options

Fixed warnings about int64 to int32 conversion 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 65e63072
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavutil/common.h
View file @ b0e1557f
...@@ -171,7 +171,7 @@ static av_always_inline av_const int16_t av_clip_int16_c(int a) ...@@ -171,7 +171,7 @@ static av_always_inline av_const int16_t av_clip_int16_c(int a)
static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a) static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
{ {
if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF; if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
else return a; else return (int32_t)a;
} }
/** /**
...@@ -230,7 +230,7 @@ static av_always_inline av_const int av_popcount_c(uint32_t x) ...@@ -230,7 +230,7 @@ static av_always_inline av_const int av_popcount_c(uint32_t x)
*/ */
static av_always_inline av_const int av_popcount64_c(uint64_t x) static av_always_inline av_const int av_popcount64_c(uint64_t x)
{ {
return av_popcount(x) + av_popcount(x >> 32); return av_popcount((uint32_t)x) + av_popcount(x >> 32);
} }
#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) #define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment