From fb0c9d41d685abb58575c5482ca33b8cd457c5ec Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-libav@jannau.net>
Date: Thu, 23 Jan 2014 16:20:23 +0100
Subject: [PATCH] avutil: remove timer.h include from internal.h

Added libavutil/timer.h include to all files with {START,STOP}_TIMER.
---
 libavcodec/dnxhddec.c      | 1 +
 libavcodec/dnxhdenc.c      | 1 +
 libavcodec/ffv1dec.c       | 1 +
 libavcodec/h264.c          | 1 +
 libavcodec/h264_cabac.c    | 1 +
 libavcodec/ivi_common.c    | 1 +
 libavcodec/mpegvideo.c     | 1 +
 libavcodec/mpegvideo_enc.c | 1 +
 libavutil/aes.c            | 1 +
 libavutil/eval.c           | 1 +
 libavutil/internal.h       | 1 -
 11 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 5c29b3e..854258b 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -23,6 +23,7 @@
  */
 
 #include "libavutil/imgutils.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dnxhddata.h"
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 5eef57e..990c3b2 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -28,6 +28,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
 #include "libavutil/opt.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "internal.h"
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 5edc667..8f7b2bf 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -30,6 +30,7 @@
 #include "libavutil/crc.h"
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 5069e4a..fd9f796 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -28,6 +28,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/stereo3d.h"
+#include "libavutil/timer.h"
 #include "internal.h"
 #include "cabac.h"
 #include "cabac_functions.h"
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 43ddf7d..654eab7 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -28,6 +28,7 @@
 #define CABAC(h) 1
 
 #include "libavutil/attributes.h"
+#include "libavutil/timer.h"
 #include "config.h"
 #include "cabac.h"
 #include "cabac_functions.h"
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 8c5d7f3..1e064ed 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -28,6 +28,7 @@
 
 #define BITSTREAM_READER_LE
 #include "libavutil/attributes.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index a80f737..3e86617 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -31,6 +31,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "internal.h"
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 5da5a25..091bee3 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -34,6 +34,7 @@
 #include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "dct.h"
 #include "dsputil.h"
diff --git a/libavutil/aes.c b/libavutil/aes.c
index 4656a48..3ba5e9a 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];
diff --git a/libavutil/eval.c b/libavutil/eval.c
index 48f8e66..72f976c 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -33,6 +33,7 @@
 #include "log.h"
 #include "mathematics.h"
 #include "avstring.h"
+#include "timer.h"
 
 typedef struct Parser {
     const AVClass *class;
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 33a5226..ecd535b 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -36,7 +36,6 @@
 #include <assert.h>
 #include "config.h"
 #include "attributes.h"
-#include "timer.h"
 #include "dict.h"
 
 #if ARCH_X86
-- 
2.7.4