diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:16:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:16:38 +0100 |
| commit | cdbebae44440bea97f300f256d722c1495753bc2 (patch) | |
| tree | b9fc7a0e480d3c10bd950cd8495b48982f78de78 /libavcodec/vp8.c | |
| parent | 8426edef4cf521104bb9288ac46a48dc4bdaee53 (diff) | |
| parent | 85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa (diff) | |
| download | ffmpeg-cdbebae44440bea97f300f256d722c1495753bc2.tar.gz | |
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/vp8.c')
| -rw-r--r-- | libavcodec/vp8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 147c4f90b5..6ad26f3a7b 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -1916,8 +1916,8 @@ void inter_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], mb->bmv[2 * y * 4 + 2 * x + 1].y + mb->bmv[(2 * y + 1) * 4 + 2 * x ].y + mb->bmv[(2 * y + 1) * 4 + 2 * x + 1].y; - uvmv.x = (uvmv.x + 2 + (uvmv.x >> (INT_BIT - 1))) >> 2; - uvmv.y = (uvmv.y + 2 + (uvmv.y >> (INT_BIT - 1))) >> 2; + uvmv.x = (uvmv.x + 2 + FF_SIGNBIT(uvmv.x)) >> 2; + uvmv.y = (uvmv.y + 2 + FF_SIGNBIT(uvmv.y)) >> 2; if (s->profile == 3) { uvmv.x &= ~7; uvmv.y &= ~7; |