[FFmpeg-cvslog] Merge commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  4 21:09:13 2014 +0100| [567ea2d64c63ff7526887183c618ed272ccc3344] | committer: Michael Niedermayer

Merge commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26'

* commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26':
  motion_est: remove dead code

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

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