Merge commit '4885bde3187a2bb0cae85b67796e07db233bf77f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:26:59 +0000 (15:26 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:26:59 +0000 (15:26 +0200)
* commit '4885bde3187a2bb0cae85b67796e07db233bf77f':
  motion_est_template: Fix undefined left shift of negative number

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/motion_est_template.c

Simple merge