Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 10:30:10 +0000 (12:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 10:30:55 +0000 (12:30 +0200)
commit2896b981830ec5835732c044a2f6c606ee9fd5e6
tree70acce4dd8068e04843a986c79a6614cbfb369d3
parent872e087305a46377b77eaedc4e90d4ab451ae7be
parentd0c093021943e9b9c23528b12cd61ca2a5b01b4f
Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'

* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f':
  avconv: Use av_gettime_relative

Conflicts:
ffmpeg.c

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