* commit '094a7405':
  x86: ABSB: port to cpuflags
  sdp: Include SRTP crypto params if using the srtp protocol
Merged-by: Michael Niedermayer <michaelni@gmx.at>