[vlc/el7] (9 commits) ...Merge branch 'master' into el7

Summary of changes: 756a26b... Fixup for arm asdcplib (*) fb5405f... Move asdcp plugin to extras (*) ace4871... Update changelog (*) 4463e72... fixup ascdbuild not fixed on i686 (*) f4c50d3... Fix typo (*) 55920a2... Avoid files listed twice (*) 0b439d6... Rework with/without options (*) 0909abc... Update changelog (*) c442cb7... Merge branch 'master' into el7 (*) This commit already existed in another branch; no separate mail sent