diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-18 16:43:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-18 16:43:46 +0200 |
| commit | 3c3daf4d198306295e3342631f19422bdc258dbb (patch) | |
| tree | 96087928a24b17dbd893c7ab5dfa5f45a76de4ae /libavutil/random_seed.c | |
| parent | 93263dc19e441f347baf9c36b5bc83693f16d084 (diff) | |
| parent | 9bc8bcddbd4fc394e2268e9849dcbf3bad6de980 (diff) | |
| download | ffmpeg-3c3daf4d198306295e3342631f19422bdc258dbb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
dsputil: remove disabled code
tta: remove disabled code
gxfenc: place variable declarations before statements
x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template
random_seed: use proper #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/random_seed.c')
| -rw-r--r-- | libavutil/random_seed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 6d19b1a9fe..81805e5db0 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -20,10 +20,10 @@ #include <unistd.h> #include <fcntl.h> +#include <math.h> +#include <time.h> #include "timer.h" -#include "time.h" #include "random_seed.h" -#include "avutil.h" static int read_random(uint32_t *dst, const char *file) { |