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>

diff --cc libavcodec/cabac.c
index dff0a91,b6f56f0..65579d8
--- 1/libavcodec/cabac.c
--- 2/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@@ -27,6 -27,6 +27,7 @@@
  #include <string.h>
  
  #include "libavutil/common.h"
++#include "libavutil/timer.h"
  #include "get_bits.h"
  #include "cabac.h"
  #include "cabac_functions.h"

diff --cc libavcodec/dnxhddec.c
Simple merge

diff --cc libavcodec/dnxhdenc.c
Simple merge

diff --cc libavcodec/h264.c
index e90f571,fd9f796..3849d9b
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -25,12 -25,10 +25,13 @@@
   * @author Michael Niedermayer <michaelni@gmx.at>
   */
  
 +#define UNCHECKED_BITSTREAM_READER 1
 +
  #include "libavutil/avassert.h"
  #include "libavutil/imgutils.h"
 +#include "libavutil/opt.h"
  #include "libavutil/stereo3d.h"
+ #include "libavutil/timer.h"
  #include "internal.h"
  #include "cabac.h"
  #include "cabac_functions.h"

diff --cc libavcodec/h264_cabac.c
index d35c408,654eab7..83aac22
--- 1/libavcodec/h264_cabac.c
--- 2/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@@ -26,9 -26,9 +26,10 @@@
   */
  
  #define CABAC(h) 1
 +#define UNCHECKED_BITSTREAM_READER 1
  
  #include "libavutil/attributes.h"
+ #include "libavutil/timer.h"
  #include "config.h"
  #include "cabac.h"
  #include "cabac_functions.h"

diff --cc libavcodec/ivi_common.c
Simple merge

diff --cc libavcodec/mpegvideo.c
index 2b3db2f,3e86617..39f40cc
--- 1/libavcodec/mpegvideo.c
--- 2/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@@ -31,9 -31,9 +31,10 @@@
  #include "libavutil/avassert.h"
  #include "libavutil/imgutils.h"
  #include "libavutil/internal.h"
+ #include "libavutil/timer.h"
  #include "avcodec.h"
  #include "dsputil.h"
 +#include "h264chroma.h"
  #include "internal.h"
  #include "mathops.h"
  #include "mpegvideo.h"

diff --cc libavcodec/mpegvideo_enc.c
Simple merge

diff --cc libavutil/aes.c
Simple merge

diff --cc libavutil/base64.c
index 348690d,725b035..03ebce8
--- 1/libavutil/base64.c
--- 2/libavutil/base64.c
+++ b/libavutil/base64.c
@@@ -26,21 -26,13 +26,22 @@@
  
  #include "common.h"
  #include "base64.h"
 +#include "intreadwrite.h"
++#include "timer.h"
  
  /* ---------------- private code */
 -static const uint8_t map2[] =
 +static const uint8_t map2[256] =
  {
 +    0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 +    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 +    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 +    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 +    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 +    0xff, 0xff, 0xff,
 +
      0x3e, 0xff, 0xff, 0xff, 0x3f, 0x34, 0x35, 0x36,
      0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0xff,
 -    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01,
 +    0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x00, 0x01,
      0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
      0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
      0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,

diff --cc libavutil/eval.c
index 635e538,72f976c..4a313bf
--- 1/libavutil/eval.c
--- 2/libavutil/eval.c
+++ b/libavutil/eval.c
@@@ -33,8 -32,8 +33,9 @@@
  #include "eval.h"
  #include "log.h"
  #include "mathematics.h"
 +#include "time.h"
  #include "avstring.h"
+ #include "timer.h"
  
  typedef struct Parser {
      const AVClass *class;

diff --cc libavutil/internal.h
index 9c5546f,ecd535b..4de5226
--- 1/libavutil/internal.h
--- 2/libavutil/internal.h
+++ b/libavutil/internal.h
@@@ -36,10 -36,7 +36,9 @@@
  #include <assert.h>
  #include "config.h"
  #include "attributes.h"
- #include "timer.h"
 +#include "cpu.h"
  #include "dict.h"
 +#include "version.h"
  
  #if ARCH_X86
  #   include "x86/emms.h"