diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:50:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:51:01 +0200 |
| commit | 803445e02c773fc29040629abdc297534ab6c3f3 (patch) | |
| tree | f4af5e0b5e8527a7d6a280978d569502dd1e4d24 /libavutil/des.c | |
| parent | c45e9097d839e69ab74160386db5e9728deaaf62 (diff) | |
| parent | a0b901a348e435f0234440736670fc9e8fcca836 (diff) | |
| download | ffmpeg-803445e02c773fc29040629abdc297534ab6c3f3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Drop pointless directory name prefixes from #includes in the current dir
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/des.c')
| -rw-r--r-- | libavutil/des.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/des.c b/libavutil/des.c index a7a5074203..57ad0a4fff 100644 --- a/libavutil/des.c +++ b/libavutil/des.c @@ -339,7 +339,9 @@ void av_des_mac(AVDES *d, uint8_t *dst, const uint8_t *src, int count) { #ifdef TEST #include <stdlib.h> #include <stdio.h> -#include "libavutil/time.h" + +#include "time.h" + static uint64_t rand64(void) { uint64_t r = rand(); r = (r << 32) | rand(); |