xbmc: Revert Upstream Annex-B bitstream patch (doen't work)
xbmc: Add upstream fix for Annex-B bitstream converter (version 2)