[FFmpeg-cvslog] Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 12:24:16 2014 +0100| [3e5833802ec711b2ffde3137374170a650d67abc] | committer: Michael Niedermayer

Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'

* commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d':
  h264: Remove MotionEstContext and move the relevant fields to H264Context

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

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