diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 11:04:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 11:06:56 +0200 |
| commit | e96ca404eae87e242b0ec0ca52897e9e135f8780 (patch) | |
| tree | 74ccc8e37900294406d386e9270f11e9214d6ffb /libavutil/error.h | |
| parent | 08e6832a94cc1de441625f7834db739d131e23a6 (diff) | |
| parent | 1bd0bdcdc236099d5c0d179696951f35f5310fa5 (diff) | |
| download | ffmpeg-streaming-e96ca404eae87e242b0ec0ca52897e9e135f8780.zip ffmpeg-streaming-e96ca404eae87e242b0ec0ca52897e9e135f8780.tar.gz | |
Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'
* commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5':
lavu: Add av_gettime_relative
Conflicts:
libavutil/time.c
libavutil/time.h
libavutil/version.h
See: 0eec06ed8747923faa6a98e474f224d922dc487d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/error.h')
0 files changed, 0 insertions, 0 deletions
