Merge commit '4885bde3187a2bb0cae85b67796e07db233bf77f'

* commit '4885bde3187a2bb0cae85b67796e07db233bf77f': motion_est_template: Fix undefined left shift of negative number Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago · fe294b3403
parent cbed8dbb7e 4885bde318
commit fe294b3403
1 changed files with 2 additions and 1 deletions
--- 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;