I've posted a new version. The new version is more conservative with audio stream muxing. It will leave the virtual buffer less full, in order to fix playback on s3 tivos (after reinsertion).