Merge commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:34:24 +0000 (17:34 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:34:24 +0000 (17:34 +0000)
This commit is a no-op.

* commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3':
  msvc: Fix libx264 linking
  doc: Improve the channelsplit example
  configure: Support MSYS2 mingw-w64 64bit

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

Trivial merge