Replace libavutil internal header #includes with MPlayer copies

Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h
and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/
instead.

cpudetect.h

@@ -8,7 +8,7 @@
 #define CPUTYPE_I586	5
 #define CPUTYPE_I686    6
 
-#include "libavutil/x86_cpu.h"
+#include "ffmpeg_files/x86_cpu.h"
 
 typedef struct cpucaps_s {
 	int cpuType;

libmpcodecs/ad_msadpcm.c

@@ -13,7 +13,7 @@
 
 #include "config.h"
 #include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include "mpbswap.h"
 #include "ad_internal.h"
 

libmpcodecs/ae_lavc.c

@@ -16,7 +16,7 @@
 #include "libaf/af_format.h"
 #include "libaf/reorder_ch.h"
 #include "libavcodec/avcodec.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 static AVCodec        *lavc_acodec;
 static AVCodecContext *lavc_actx;

libmpcodecs/vd_ffmpeg.c

@@ -10,7 +10,7 @@
 #include "av_opts.h"
 
 #include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include "mpbswap.h"
 #include "fmt-conversion.h"
 

libmpcodecs/ve_nuv.c

@@ -19,7 +19,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include <lzo/lzo1x.h>
 #include "native/rtjpegn.h"
 

libmpcodecs/vf_gradfun.c

@@ -39,7 +39,7 @@
 #include "vf.h"
 #include "libvo/fastmemcpy.h"
 #include "libavutil/avutil.h"
-#include "libavutil/x86_cpu.h"
+#include "ffmpeg_files/x86_cpu.h"
 
 struct vf_priv_s {
     int thresh;

libmpdemux/asfheader.c

@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 

libmpdemux/demux_asf.c

@@ -33,7 +33,7 @@
 #include "demuxer.h"
 
 #include "libvo/fastmemcpy.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 // defined at asfheader.c:
 

libmpdemux/demux_audio.c

@@ -27,7 +27,7 @@
 #include "stheader.h"
 #include "genres.h"
 #include "mp3_hdr.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 #include <string.h>
 

libmpdemux/demux_mkv.c

@@ -58,7 +58,7 @@
 #endif
 
 #include "libavutil/lzo.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include "libavutil/avstring.h"
 
 static const unsigned char sipr_swaps[38][2]={

libmpdemux/demux_mov.c

@@ -63,7 +63,7 @@
 
 #include "libmpcodecs/img_format.h"
 #include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 #include "libvo/sub.h"
 

libmpdemux/demux_ogg.c

@@ -31,7 +31,7 @@
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's')
 #define FOURCC_SPEEX  mmioFOURCC('s', 'p', 'x', ' ')

libmpdemux/demux_ty.c

@@ -45,7 +45,7 @@
 #include "stheader.h"
 #include "sub_cc.h"
 #include "libavutil/avstring.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 void skip_audio_frame( sh_audio_t *sh_audio );
 extern int sub_justify;

libmpdemux/demux_vqf.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include "mpbswap.h"
 
 #include "stream/stream.h"

mpbswap.h

@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 #include "config.h"
-#include "libavutil/bswap.h"
+#include "ffmpeg_files/bswap.h"
 
 #ifndef HAVE_SWAB
 void swab(const void *from, void *to, ssize_t n);

mpcommon.c

@@ -16,7 +16,7 @@
 #ifdef CONFIG_TV_TELETEXT
 #include "stream/tv.h"
 #endif
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include "m_option.h"
 
 double sub_last_pts = -303;

mplayer.c

@@ -51,7 +51,7 @@
 
 #include "cfg-mplayer-def.h"
 
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 #include "subreader.h"
 

spudec.c

@@ -25,7 +25,7 @@
 #include "spudec.h"
 #include "vobsub.h"
 #include "libavutil/avutil.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include "libswscale/swscale.h"
 
 /* Valid values for spu_aamode:

stream/asf_streaming.c

@@ -24,7 +24,7 @@
 #include "network.h"
 #include "tcp.h"
 
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 #include "libmpdemux/asfguid.h"
 

stream/pnm.c

@@ -43,7 +43,7 @@
 #include <winsock2.h>
 #endif
 
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 #include "stream.h"
 #include "libmpdemux/demuxer.h"

stream/realrtsp/real.c

@@ -37,7 +37,7 @@
 #include "sdpplin.h"
 #include "xbuffer.h"
 #include "libavutil/md5.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include "stream/http.h"
 #include "mp_msg.h"
 

stream/realrtsp/rmff.c

@@ -29,7 +29,7 @@
 #include "rmff.h"
 #include "xbuffer.h"
 #include "mp_msg.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 /*
 #define LOG

stream/stream_dvd.c

@@ -39,7 +39,7 @@
 #include "stream_dvd.h"
 #include "stream_dvd_common.h"
 #include "libmpdemux/demuxer.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 
 extern char* dvd_device;
 static char* dvd_device_current;

stream/vcd_read.h

@@ -7,7 +7,7 @@
 #include <sys/ioctl.h>
 #include "mp_msg.h"
 #include "stream.h"
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 //=================== VideoCD ==========================
 #if	defined(__linux__) || defined(sun) || defined(__bsdi__)
 

stream/vcd_read_fbsd.h

@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 #include <inttypes.h>
-#include "libavutil/intreadwrite.h"
+#include "ffmpeg_files/intreadwrite.h"
 #include <sys/cdio.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #define VCD_NETBSD 1