summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2014-01-23 16:20:23 +0100
committerJanne Grunau <janne-libav@jannau.net>2014-01-25 21:50:20 +0100
commitfb0c9d41d685abb58575c5482ca33b8cd457c5ec (patch)
treef06b9bf7072a95a5afaa160e51d05d9bb894ea94
parent28e1eed3c2e7e944f1d73dc749076943aeb4c13c (diff)
avutil: remove timer.h include from internal.h
Added libavutil/timer.h include to all files with {START,STOP}_TIMER.
-rw-r--r--libavcodec/dnxhddec.c1
-rw-r--r--libavcodec/dnxhdenc.c1
-rw-r--r--libavcodec/ffv1dec.c1
-rw-r--r--libavcodec/h264.c1
-rw-r--r--libavcodec/h264_cabac.c1
-rw-r--r--libavcodec/ivi_common.c1
-rw-r--r--libavcodec/mpegvideo.c1
-rw-r--r--libavcodec/mpegvideo_enc.c1
-rw-r--r--libavutil/aes.c1
-rw-r--r--libavutil/eval.c1
-rw-r--r--libavutil/internal.h1
11 files changed, 10 insertions, 1 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 5c29b3e139..854258b23d 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 5eef57e5f1..990c3b21b4 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 5edc667db4..8f7b2bf32e 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 5069e4a456..fd9f7962d2 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 43ddf7d56e..654eab7fcf 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 8c5d7f32c3..1e064ed2ee 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 a80f737e05..3e86617a9c 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 5da5a25f9e..091bee39d7 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 4656a48634..3ba5e9aef4 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 48f8e66ec6..72f976ca4b 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 33a52266c5..ecd535b808 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