[FFmpeg-cvslog] Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 24 12:16:09 2014 +0200| [872e087305a46377b77eaedc4e90d4ab451ae7be] | committer: Michael Niedermayer

Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'

* commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72':
  avplay: Use av_gettime_relative

Conflicts:
	ffplay.c

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

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