summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-22 03:04:08 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-26 06:16:43 +0300
commitd6c410b54cbccabda7b36a929bff37e8510a4cc5 (patch)
tree7e17a920986879ec168d0882aea379f79a802cc6 /stream
parenta810867d04e80c57b2f5e5a60a1af37bb5a6dfd6 (diff)
downloadmpv-d6c410b54cbccabda7b36a929bff37e8510a4cc5.tar.bz2
mpv-d6c410b54cbccabda7b36a929bff37e8510a4cc5.tar.xz
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.
Diffstat (limited to 'stream')
-rw-r--r--stream/asf_streaming.c2
-rw-r--r--stream/pnm.c2
-rw-r--r--stream/realrtsp/real.c2
-rw-r--r--stream/realrtsp/rmff.c2
-rw-r--r--stream/stream_dvd.c2
-rw-r--r--stream/vcd_read.h2
-rw-r--r--stream/vcd_read_fbsd.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index 7dfd2831b8..77c0b1ea09 100644
--- a/stream/asf_streaming.c
+++ b/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"
diff --git a/stream/pnm.c b/stream/pnm.c
index 650aeb40cb..e211a67f8d 100644
--- a/stream/pnm.c
+++ b/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"
diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c
index 9f01a5dfb0..d81b265bab 100644
--- a/stream/realrtsp/real.c
+++ b/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"
diff --git a/stream/realrtsp/rmff.c b/stream/realrtsp/rmff.c
index c4430de145..b98ccd9377 100644
--- a/stream/realrtsp/rmff.c
+++ b/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
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 09429cbf08..8dc73b96b3 100644
--- a/stream/stream_dvd.c
+++ b/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;
diff --git a/stream/vcd_read.h b/stream/vcd_read.h
index b31abc0401..bd07b02d1f 100644
--- a/stream/vcd_read.h
+++ b/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__)
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index 132b6b2994..cc75bcc03f 100644
--- a/stream/vcd_read_fbsd.h
+++ b/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