diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 23:48:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 23:48:41 +0100 |
| commit | a3be0c334e8ba7e447a734aa2be862815e5daf85 (patch) | |
| tree | fda35dd02a3d7c43d21fe884731859c959be092e /libavutil/timer.h | |
| parent | 5a633ec2dd453c67ff23819c28d98e6b09c47295 (diff) | |
| parent | a1e1f35203bbcbea0efb51d93e96769c826b8c64 (diff) | |
| download | ffmpeg-a3be0c334e8ba7e447a734aa2be862815e5daf85.tar.gz | |
Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'
* commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64':
lavu: add missing log.h include in timer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timer.h')
| -rw-r--r-- | libavutil/timer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/timer.h b/libavutil/timer.h index 3e242f3463..8de67f16d2 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -32,6 +32,8 @@ #include "config.h" +#include "log.h" + #if ARCH_ARM # include "arm/timer.h" #elif ARCH_BFIN |