Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'

* commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64':
  lavu: add missing log.h include in timer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavutil/timer.h

@@ -32,6 +32,8 @@
 
 #include "config.h"
 
+#include "log.h"
+
 #if   ARCH_ARM
 #   include "arm/timer.h"
 #elif ARCH_BFIN