[FFmpeg-cvslog] Merge commit 'd1a6cb195f610978ba5d2351e60f938f7f261d59'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  9 12:27:55 2015 +0200| [2ecbf44f21c09f8f03bf142b6ce033d5da2cd731] | committer: Michael Niedermayer

Merge commit 'd1a6cb195f610978ba5d2351e60f938f7f261d59'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ecbf44f21c09f8f03bf142b6ce033d5da2cd731
---