Merge commit '60f0fde3092d18d4d36555962c192af8691a099c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:06:36 +0000 (17:06 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:06:54 +0000 (17:06 +0000)
commit113c25653320b0a72548d07242a3cc4ce086f02d
tree1d58d7fe422db5697b96a1ef026abee80a119573
parent2f78be00194be4d6dbb1de1e7bee428b63a21fea
parent60f0fde3092d18d4d36555962c192af8691a099c
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@gmail.com>