Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed warnings about int64 to int32 conversion

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/30/merge
Michael Bradshaw 13 years ago committed by Michael Niedermayer
parent 65e63072f8
commit b0e1557fe7
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavutil/common.h

4
libavutil/common.h
Unescape View File

@ -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)
*/ */
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))

Write Preview
Loading…
Cancel
Save