Remove mplayer hacks and update ffmpeg patch