diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 12:30:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 12:30:55 +0200 |
| commit | 2896b981830ec5835732c044a2f6c606ee9fd5e6 (patch) | |
| tree | 70acce4dd8068e04843a986c79a6614cbfb369d3 /libavformat/network.c | |
| parent | 872e087305a46377b77eaedc4e90d4ab451ae7be (diff) | |
| parent | d0c093021943e9b9c23528b12cd61ca2a5b01b4f (diff) | |
| download | ffmpeg-2896b981830ec5835732c044a2f6c606ee9fd5e6.tar.gz | |
Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'
* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f':
avconv: Use av_gettime_relative
Conflicts:
ffmpeg.c
See: 76191c08f88fd66cf9198afc0c4a809c4c0336d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.c')
0 files changed, 0 insertions, 0 deletions