[FFmpeg-cvslog] Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'
Michael Niedermayer
git at videolan.org
Fri Oct 24 11:34:07 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 24 11:04:52 2014 +0200| [e96ca404eae87e242b0ec0ca52897e9e135f8780] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e96ca404eae87e242b0ec0ca52897e9e135f8780
---
More information about the ffmpeg-cvslog
mailing list