Updated to r6442 and Added mpv option.