Merge pull request #9074 from fritsch/ffmpeg-2.8.6-kodi-1
authorMartijn Kaijser <martijn@xbmc.org>
Sun, 7 Feb 2016 14:43:07 +0000 (15:43 +0100)
committerMartijn Kaijser <martijn@xbmc.org>
Sun, 7 Feb 2016 14:43:07 +0000 (15:43 +0100)
FFmpeg 2.8.6-Jarvis-16.0


Trivial merge