Merge commit 'd1a6cb195f610978ba5d2351e60f938f7f261d59'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 10:27:55 +0000 (12:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 10:28:09 +0000 (12:28 +0200)
commit2ecbf44f21c09f8f03bf142b6ce033d5da2cd731
tree2c6ada8ffe22c695ed6cae7512366a862bbc0c35
parent7e85727b984a605f1824fe076b58bf8209d83999
parentd1a6cb195f610978ba5d2351e60f938f7f261d59
Merge commit 'd1a6cb195f610978ba5d2351e60f938f7f261d59'

* commit 'd1a6cb195f610978ba5d2351e60f938f7f261d59':
  x86: Serialize rdtsc in read_time()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/x86/timer.h