[FFmpeg-cvslog] Merge commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 17:34:24 2016 +0000| [e7b8ec8b6fd85464da473d317593ba061529932c] | committer: Derek Buitenhuis

Merge commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3'

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7b8ec8b6fd85464da473d317593ba061529932c
---