From d6c410b54cbccabda7b36a929bff37e8510a4cc5 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Wed, 22 Jul 2009 03:04:08 +0300 Subject: 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. --- stream/asf_streaming.c | 2 +- stream/pnm.c | 2 +- stream/realrtsp/real.c | 2 +- stream/realrtsp/rmff.c | 2 +- stream/stream_dvd.c | 2 +- stream/vcd_read.h | 2 +- stream/vcd_read_fbsd.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'stream') 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 #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 #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 #include -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include #if defined(__NetBSD__) || defined(__OpenBSD__) #define VCD_NETBSD 1 -- cgit v1.2.3