merge conflict, old version have pushed on the tree -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20150318/49c5caa8/attachment.html>