Commit 113c2565 authored by Derek Buitenhuis's avatar Derek Buitenhuis

Merge commit '60f0fde3'

This commit is a no-op.

* commit '60f0fde3':
  libx264: Make sure to preserve default option values
Merged-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parents 2f78be00 60f0fde3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment