[FFmpeg-cvslog] Merge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb  3 16:53:13 2016 +0000| [43c0298208ad6fe36a4dbf03824842d89c3ed143] | committer: Derek Buitenhuis

Merge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607'

* commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607':
  lavc: Move me_penalty_compensation to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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