Merge commit '094a7405e5d8463d7d167d893e04934ec1a84ecd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 15:12:18 +0000 (16:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 15:12:24 +0000 (16:12 +0100)
commit77041e2474a107bb86259ab2c8b1bc6600ed093f
tree277dab3d3787cb6e12441f465c4881baf03bf1b4
parentb52925d2cde98b2a3ffaf451248191c8627d356a
parent094a7405e5d8463d7d167d893e04934ec1a84ecd
Merge commit '094a7405e5d8463d7d167d893e04934ec1a84ecd'

* commit '094a7405e5d8463d7d167d893e04934ec1a84ecd':
  x86: ABSB: port to cpuflags
  sdp: Include SRTP crypto params if using the srtp protocol

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/sdp.c
libavutil/x86/x86util.asm