[FFmpeg-cvslog] Merge commit '6fdf35fe35d8c1c467708238100648a7a47c930d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 24 11:41:02 2014 +0200| [8fd07fa6cc37550ca120efa7bfbd539ce0e06173] | committer: Michael Niedermayer

Merge commit '6fdf35fe35d8c1c467708238100648a7a47c930d'

* commit '6fdf35fe35d8c1c467708238100648a7a47c930d':
  lavc: Use av_gettime_relative

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

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