summaryrefslogtreecommitdiffstats
path: root/libavutil/time.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-111-1/+1
|\ | | | | | | | | | | | | * qatar/master: Drop pointless directory name prefixes from #includes in the current dir Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop pointless directory name prefixes from #includes in the current dirDiego Biurrun2013-09-101-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-221-1/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add av_usleep() functionMans Rullgard2012-06-221-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function implements a delay using the first available of the following functions: - nanosleep() - usleep() - Sleep() (Windows) The conditional #includes in time.c are simplified by including unistd.h and windows.h whenever they are available rather than having these lines triggered by specific functions. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | libavutil: fix author attributionMichael Niedermayer2012-06-201-4/+6
|/ | | | | | | | | | | | | | | | | | | | | | | | Libav.org has removed this while moving the code around For reference, the code was originally added in: commit 9aeeeb63f7e1ab7b0b7bb839a5f258667a2d2d78 Author: Fabrice Bellard <fabrice@bellard.org> Date: Wed Dec 20 00:02:47 2000 +0000 Initial revision Originally committed as revision 2 to svn://svn.ffmpeg.org/ffmpeg/trunk -- The function name originates from: commit 949885313226f01ae7ba9a69eff5c45b47b78d57 Author: Fabrice Bellard <fabrice@bellard.org> Date: Thu Jul 25 16:01:46 2002 +0000 more consistent naming Originally committed as revision 802 to svn://svn.ffmpeg.org/ffmpeg/trunk Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* av_gettime: support Win32 without gettimeofday()Mans Rullgard2012-06-201-0/+16
| | | | | | Based on patch by Ronald S. Bultje. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Move av_gettime() to libavutilMans Rullgard2012-06-201-0/+30
Signed-off-by: Mans Rullgard <mans@mansr.com>
OpenPOWER on IntegriCloud