Merge branch 'master' into next

* master:
  Include regex.h from para.h.

diff --cc afs.c
Simple merge

diff --cc audioc.c
Simple merge

diff --cc client.c
Simple merge

diff --cc imdct.c
Simple merge

diff --cc interactive.c
Simple merge

diff --cc play.c
Simple merge

diff --cc wmadec_filter.c
Simple merge