diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 16:26:59 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 16:26:59 +0300 |
| commit | fe294b34030becfa58001dffaff0311b19e60526 (patch) | |
| tree | c35881875efd3a881569a28cd137777e4cfb9710 /libavcodec/motion_est_template.c | |
| parent | cbed8dbb7e1e2ac73b93502ee2a56a4e3ee51354 (diff) | |
| parent | 4885bde3187a2bb0cae85b67796e07db233bf77f (diff) | |
Merge commit '4885bde3187a2bb0cae85b67796e07db233bf77f'
* commit '4885bde3187a2bb0cae85b67796e07db233bf77f':
motion_est_template: Fix undefined left shift of negative number
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/motion_est_template.c')
| -rw-r--r-- | libavcodec/motion_est_template.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 2141771fa9..37ff1102ea 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -702,7 +702,8 @@ static int sab_diamond_search(MpegEncContext * s, int *best, int dmin, key += (1<<(ME_MAP_MV_BITS-1)) + (1<<(2*ME_MAP_MV_BITS-1)); - if((key&(-(1<<(2*ME_MAP_MV_BITS)))) != map_generation) continue; + if ((key & (-(1 << (2 * ME_MAP_MV_BITS)))) != map_generation) + continue; minima[j].height= score_map[i]; minima[j].x= key & ((1<<ME_MAP_MV_BITS)-1); key>>=ME_MAP_MV_BITS; |