2012-01-09, 21:20
grad: There are some changes to the PVR code but it looks like your diff caught those too. It might be easier for you to create a github account, fork the xvba branch and merge tsp/master with it. For pushing my changes upstream I use a branch based on xbmc or dushmaniacs PVR branch and cherry pick the commits to them.