Add 'xvid' as format; Fix removal of file on failure