]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f78be0 60f0fde)
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)
This commit is a no-op.

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

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.