diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-13 02:49:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-13 02:49:22 +0200 |
| commit | 9891004ba91a126f56cd02c6f7a7b0c368a158b9 (patch) | |
| tree | 05dd1b2b9250a7d09d9e9142be55100a581d2396 /libavcodec/dsputil.c | |
| parent | a0f17473b37589d8e05f42fefa5a266a2b33831c (diff) | |
| parent | 578d6861a753eb0b9d277f7ec17d1502eb2bb35a (diff) | |
| download | ffmpeg-9891004ba91a126f56cd02c6f7a7b0c368a158b9.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases
Error out if vaapi is not found
avio: undeprecate av_url_read_fseek/fpause under nicer names
libvo-*: Don't use deprecated sample format names and enum names
DUPLICATE flvdec: Fix support for flvtool2 "keyframes based" generated index
DUPLICATE libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization
Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.
Convert some undefined 1<<31 shifts into 1U<<31.
Conflicts:
configure
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
libavformat/flvdec.c
Marged-by: Michael Niedermayer <michaelni@gmx.at>
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 de74fe7ac5..90e6440a87 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2610,7 +2610,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; } @@ -2618,7 +2618,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) { |