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/time.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/time.c')
| -rw-r--r-- | libavutil/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/time.c b/libavutil/time.c index 27feb0b758..5a00e7025d 100644 --- a/libavutil/time.c +++ b/libavutil/time.c @@ -33,7 +33,7 @@ #include <windows.h> #endif -#include "libavutil/time.h" +#include "time.h" #include "error.h" int64_t av_gettime(void) |