From d6c410b54cbccabda7b36a929bff37e8510a4cc5 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Wed, 22 Jul 2009 03:04:08 +0300 Subject: [PATCH] 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 | 2 +- libmpcodecs/ad_msadpcm.c | 2 +- libmpcodecs/ae_lavc.c | 2 +- libmpcodecs/vd_ffmpeg.c | 2 +- libmpcodecs/ve_nuv.c | 2 +- libmpcodecs/vf_gradfun.c | 2 +- libmpdemux/asfheader.c | 2 +- libmpdemux/demux_asf.c | 2 +- libmpdemux/demux_audio.c | 2 +- libmpdemux/demux_mkv.c | 2 +- libmpdemux/demux_mov.c | 2 +- libmpdemux/demux_ogg.c | 2 +- libmpdemux/demux_ty.c | 2 +- libmpdemux/demux_vqf.c | 2 +- mpbswap.h | 2 +- mpcommon.c | 2 +- mplayer.c | 2 +- spudec.c | 2 +- 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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cpudetect.h b/cpudetect.h index 5ac4633582..c80dddde11 100644 --- a/cpudetect.h +++ b/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; diff --git a/libmpcodecs/ad_msadpcm.c b/libmpcodecs/ad_msadpcm.c index 57beb9a84c..c6e6c4fc55 100644 --- a/libmpcodecs/ad_msadpcm.c +++ b/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" diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index 6806287e57..139d26636f 100644 --- a/libmpcodecs/ae_lavc.c +++ b/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; diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 4cf20037e9..0f9f9f7400 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/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" diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c index 67cc8b532d..b9d9b860ba 100644 --- a/libmpcodecs/ve_nuv.c +++ b/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 #include "native/rtjpegn.h" diff --git a/libmpcodecs/vf_gradfun.c b/libmpcodecs/vf_gradfun.c index 26a859f459..83ae6fb9d6 100644 --- a/libmpcodecs/vf_gradfun.c +++ b/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; diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 7cf0111e67..905ec83949 100644 --- a/libmpdemux/asfheader.c +++ b/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" diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index e000376b40..0290034b7a 100644 --- a/libmpdemux/demux_asf.c +++ b/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: diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index d9ea6f2f84..aa950046c6 100644 --- a/libmpdemux/demux_audio.c +++ b/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 diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 3972c1bd6f..5c05dbf585 100644 --- a/libmpdemux/demux_mkv.c +++ b/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]={ diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index c38fa7ee16..10da40c5bb 100644 --- a/libmpdemux/demux_mov.c +++ b/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" diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index af730bb712..4816c789ec 100644 --- a/libmpdemux/demux_ogg.c +++ b/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', ' ') diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 77dfbe7fd5..2cb38b4370 100644 --- a/libmpdemux/demux_ty.c +++ b/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; diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c index 4ec8865a10..9a90f33fb3 100644 --- a/libmpdemux/demux_vqf.c +++ b/libmpdemux/demux_vqf.c @@ -21,7 +21,7 @@ #include #include #include "libavutil/common.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include "mpbswap.h" #include "stream/stream.h" diff --git a/mpbswap.h b/mpbswap.h index 03ef0c387b..f7e4963e45 100644 --- a/mpbswap.h +++ b/mpbswap.h @@ -3,7 +3,7 @@ #include #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); diff --git a/mpcommon.c b/mpcommon.c index 34633682a9..053a46d5a4 100644 --- a/mpcommon.c +++ b/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; diff --git a/mplayer.c b/mplayer.c index 5e49c7d424..ac02447eb5 100644 --- a/mplayer.c +++ b/mplayer.c @@ -51,7 +51,7 @@ #include "cfg-mplayer-def.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include "subreader.h" diff --git a/spudec.c b/spudec.c index 6e5c85c146..fb01f165ce 100644 --- a/spudec.c +++ b/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: 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