Merge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 09:26:27 +0000 (11:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 09:28:55 +0000 (11:28 +0200)
* commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0':
  motion_est: Fix warning from zero_cmp() assignment

See: ea41e6d6373063c3a2a9bf48ce8e1c2e6340b694
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge