[FFmpeg-cvslog] Merge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 11:26:27 2015 +0200| [924a77fb4e828587c7db6a27dbb009e112396776] | committer: Michael Niedermayer

Merge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0'

* commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0':
  motion_est: Fix warning from zero_cmp() assignment

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=924a77fb4e828587c7db6a27dbb009e112396776
---