Merge commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 09:57:10 +0000 (11:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 09:57:33 +0000 (11:57 +0200)
* commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666':
  tools: Use av_gettime_relative

See: 41120e6e40e34a840d194883a95c57a6e91b1093
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge