Merge commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 20:09:13 +0000 (21:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 20:10:02 +0000 (21:10 +0100)
commit567ea2d64c63ff7526887183c618ed272ccc3344
tree6c3a03af9cbb257c6abe2ceb4b412c199ce206c8
parenta28313b09e73d8e908223027909e9b836a3c0fa5
parent240b22afe14ef477da1b439b9ed7bca6cc7d6c26
Merge commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/motion_est.c