[FFmpeg-cvslog] Merge commit 'dad7514f9ec8a8c5e44d70fcfbbcedeff16f7e13'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 27 22:25:33 2017 +0200| [fb79adfdcecfae807d301e996f45bcb6b8ca7515] | committer: Clément Bœsch

Merge commit 'dad7514f9ec8a8c5e44d70fcfbbcedeff16f7e13'

* commit 'dad7514f9ec8a8c5e44d70fcfbbcedeff16f7e13':
  xcb: Add all the libraries to the link line explicitly

This commit is a noop. It appears we already link against the xcb shape
library since 54170a33c2c97b0f50347f57e8f0f2ea681dca1d.

Merged-by: Clément Bœsch <u at pkh.me>

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