xbmc: replace two small patches to a bigger one