Merge pull request #8881 from fritsch/jarvis-ffmpeg-2.8.5
authorMartijn Kaijser <martijn@xbmc.org>
Sat, 16 Jan 2016 12:54:03 +0000 (13:54 +0100)
committerMartijn Kaijser <martijn@xbmc.org>
Sat, 16 Jan 2016 12:54:03 +0000 (13:54 +0100)
FFmpeg: Bump to 2.8.5-Jarvis-rc1


Trivial merge