[FFmpeg-cvslog] Merge commit '60f0fde3092d18d4d36555962c192af8691a099c'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 17:06:36 2016 +0000| [113c25653320b0a72548d07242a3cc4ce086f02d] | committer: Derek Buitenhuis

Merge commit '60f0fde3092d18d4d36555962c192af8691a099c'

This commit is a no-op.

* commit '60f0fde3092d18d4d36555962c192af8691a099c':
  libx264: Make sure to preserve default option values

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

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