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>
This commit is contained in:
Derek Buitenhuis 2016-02-16 17:06:36 +00:00
commit 113c256533

Diff Content Not Available