Summary of changes:
99c333a... Revert "Update x264 to 0.148-20160412-fd2c324" (*)
ab1a9f4... Update sources (*)
ffe4b8a... Revert "Update sources" (*)
ac69c20... Revert "Revert "Update x264 to 0.148-20160412-fd2c324""
(*)
db25abd... Merge branch 'f23' (*)
2448535... rework asm treatment on i686 and ppc64 (*)
(*) This commit already existed in another branch; no separate mail sent