diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 05:16:38 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 05:16:38 +0300 |
| commit | cdbebae44440bea97f300f256d722c1495753bc2 (patch) | |
| tree | b9fc7a0e480d3c10bd950cd8495b48982f78de78 /libavcodec/cavs.c | |
| parent | 8426edef4cf521104bb9288ac46a48dc4bdaee53 (diff) | |
| parent | 85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa (diff) | |
Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'
* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa':
lavc: fix bitshifts amount bigger than the type
Conflicts:
libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 45d815a840..c0880e005f 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -30,6 +30,7 @@ #include "golomb.h" #include "h264chroma.h" #include "idctdsp.h" +#include "internal.h" #include "mathops.h" #include "qpeldsp.h" #include "cavs.h" @@ -539,8 +540,8 @@ static inline void scale_mv(AVSContext *h, int *d_x, int *d_y, { int den = h->scale_den[FFMAX(src->ref, 0)]; - *d_x = (src->x * distp * den + 256 + (src->x >> 31)) >> 9; - *d_y = (src->y * distp * den + 256 + (src->y >> 31)) >> 9; + *d_x = (src->x * distp * den + 256 + FF_SIGNBIT(src->x)) >> 9; + *d_y = (src->y * distp * den + 256 + FF_SIGNBIT(src->y)) >> 9; } static inline void mv_pred_median(AVSContext *h, |