diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-26 01:39:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-26 01:54:55 +0100 |
| commit | 965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35 (patch) | |
| tree | 1c00ee6a0981502047f9c0a3e53ec79a7af900b9 /libavutil/aes.c | |
| parent | 53167ecfdb99151c1f0d243275675a75efb881a7 (diff) | |
| parent | fb0c9d41d685abb58575c5482ca33b8cd457c5ec (diff) | |
| download | ffmpeg-965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35.tar.gz | |
Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec':
avutil: remove timer.h include from internal.h
Conflicts:
libavcodec/ffv1dec.c
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.c')
| -rw-r--r-- | libavutil/aes.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/aes.c b/libavutil/aes.c index a3eb295e24..638fb81e8d 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -23,6 +23,7 @@ #include "common.h" #include "aes.h" #include "intreadwrite.h" +#include "timer.h" typedef union { uint64_t u64[2]; |