diff options
| author | Alex Converse <aconverse@google.com> | 2011-04-09 17:22:04 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-04-11 21:47:42 -0700 |
| commit | 187a537904ef2193a4b5e0312349f95223ff8610 (patch) | |
| tree | cf34aff4d5812a7b11731316e642d393fd9648b4 /libavcodec/dsputil.c | |
| parent | db46be01ecf44608932cfa33e8914a4c38b93431 (diff) | |
| download | ffmpeg-187a537904ef2193a4b5e0312349f95223ff8610.tar.gz | |
Convert some undefined 1<<31 shifts into 1U<<31.
According to ISO 9899:1999 S 6.5.7/4:
The result of E1 << E2 is E1 left-shifted E2 bit positions; vacated bits
are filled with zeros. If E1 has an unsigned type, the value of the
result is E1× 2^E2, reduced modulo one more than the maximum value
representable in the result type. If E1 has a signed type and
nonnegative value, and E1× 2^E2 is representable in the result type, then
that is the resulting value; otherwise, the behavior is undefined.
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 33fc78a1ea..ddaf0205de 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -3827,7 +3827,7 @@ static inline uint32_t clipf_c_one(uint32_t a, uint32_t mini, { if(a > mini) return mini; - else if((a^(1<<31)) > maxisign) return maxi; + else if((a^(1U<<31)) > maxisign) return maxi; else return a; } @@ -3835,7 +3835,7 @@ static void vector_clipf_c_opposite_sign(float *dst, const float *src, float *mi int i; uint32_t mini = *(uint32_t*)min; uint32_t maxi = *(uint32_t*)max; - uint32_t maxisign = maxi ^ (1<<31); + uint32_t maxisign = maxi ^ (1U<<31); uint32_t *dsti = (uint32_t*)dst; const uint32_t *srci = (const uint32_t*)src; for(i=0; i<len; i+=8) { |