x264 and xvidcore merge done