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>

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];

libavutil/base64.c

@@ -27,6 +27,7 @@
 #include "common.h"
 #include "base64.h"
 #include "intreadwrite.h"
+#include "timer.h"
 
 /* ---------------- private code */
 static const uint8_t map2[256] =

libavutil/eval.c

@@ -35,6 +35,7 @@
 #include "mathematics.h"
 #include "time.h"
 #include "avstring.h"
+#include "timer.h"
 
 typedef struct Parser {
     const AVClass *class;

libavutil/internal.h

@@ -36,7 +36,6 @@
 #include <assert.h>
 #include "config.h"
 #include "attributes.h"
-#include "timer.h"
 #include "cpu.h"
 #include "dict.h"
 #include "version.h"