Merge commit 'ed9625eb'

* commit 'ed9625eb':
  dsputil: Move intreadwrite.h #include from header file to .c files
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/dsputil.h

@@ -30,7 +30,6 @@
 #ifndef AVCODEC_DSPUTIL_H
 #define AVCODEC_DSPUTIL_H
 
-#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "rnd_avg.h"
 

libavcodec/h264pred_template.c

@@ -25,6 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
+#include "libavutil/intreadwrite.h"
+
 #include "mathops.h"
 
 #include "bit_depth_template.c"

libavcodec/h264qpel_template.c

@@ -20,6 +20,8 @@
  */
 
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+
 #include "bit_depth_template.c"
 #include "hpel_template.c"
 

libavcodec/nuv.c

@@ -25,6 +25,7 @@
 
 #include "libavutil/bswap.h"
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/lzo.h"
 #include "libavutil/imgutils.h"
 #include "avcodec.h"

libavcodec/vc1dsp.c

@@ -27,6 +27,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 #include "h264chroma.h"
 #include "rnd_avg.h"
 #include "vc1dsp.h"

libavcodec/vp3dsp.c

@@ -26,6 +26,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "rnd_avg.h"

libavcodec/vp8dsp.c

@@ -28,6 +28,7 @@
 #include "dsputil.h"
 #include "vp8dsp.h"
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 
 #define MK_IDCT_DC_ADD4_C(name) \
 static void name ## _idct_dc_add4uv_c(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride)\