[FFmpeg-cvslog] Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 24 12:30:10 2014 +0200| [2896b981830ec5835732c044a2f6c606ee9fd5e6] | committer: Michael Niedermayer

Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'

* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f':
  avconv: Use av_gettime_relative

Conflicts:
	ffmpeg.c

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

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