diff options
35 files changed, 42 insertions, 34 deletions
diff --git a/TOOLS/subfont-c/subfont.c b/TOOLS/subfont-c/subfont.c index 2c137a0860..4a69bb611d 100644 --- a/TOOLS/subfont-c/subfont.c +++ b/TOOLS/subfont-c/subfont.c @@ -27,7 +27,7 @@ #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "osdep/timer.h" #ifndef DEBUG diff --git a/libaf/af_format.c b/libaf/af_format.c index 4b1427197a..f13b7a124a 100644 --- a/libaf/af_format.c +++ b/libaf/af_format.c @@ -23,7 +23,7 @@ long int lrintf(float); #include "af.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "libvo/fastmemcpy.h" /* Functions used by play to convert the input audio to the correct diff --git a/libao2/ao_dxr2.c b/libao2/ao_dxr2.c index 1e68a7d261..3056ba619a 100644 --- a/libao2/ao_dxr2.c +++ b/libao2/ao_dxr2.c @@ -8,7 +8,7 @@ #include "mp_msg.h" #include "help_mp.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "audio_out.h" #include "audio_out_internal.h" diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c index 70cb46eda8..6aa1fcb4db 100644 --- a/libao2/ao_pcm.c +++ b/libao2/ao_pcm.c @@ -5,7 +5,7 @@ #include <string.h> #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "subopt-helper.h" #include "libaf/af_format.h" #include "audio_out.h" diff --git a/libdha/sysdep/pci_linux.c b/libdha/sysdep/pci_linux.c index 68393ae093..ea667f6ee6 100644 --- a/libdha/sysdep/pci_linux.c +++ b/libdha/sysdep/pci_linux.c @@ -133,7 +133,7 @@ static int pci_config_type( void ) { return 1; } //#include <sys/io.h> #include <linux/pci.h> #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" static int pci_get_vendor( unsigned char bus, diff --git a/libmpcodecs/ad_dk3adpcm.c b/libmpcodecs/ad_dk3adpcm.c index d2410f1a44..6f38b248e8 100644 --- a/libmpcodecs/ad_dk3adpcm.c +++ b/libmpcodecs/ad_dk3adpcm.c @@ -17,7 +17,7 @@ #include "config.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "ad_internal.h" static ad_info_t info = diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 3b863de0d8..6e491e79c0 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -8,7 +8,7 @@ #include "ad_internal.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" static ad_info_t info = { diff --git a/libmpcodecs/ad_imaadpcm.c b/libmpcodecs/ad_imaadpcm.c index 236c82fff2..532eecad43 100644 --- a/libmpcodecs/ad_imaadpcm.c +++ b/libmpcodecs/ad_imaadpcm.c @@ -22,7 +22,7 @@ #include "config.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "ad_internal.h" #define MS_IMA_ADPCM_PREAMBLE_SIZE 4 diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index c889484cf8..ca5b0db064 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -37,7 +37,7 @@ static sample_t a52_level = 1; float a52_drc_level = 1.0; static int a52_drc_action = DRC_NO_ACTION; -#include "libavutil/bswap.h" +#include "mpbswap.h" static ad_info_t info = { diff --git a/libmpcodecs/ad_msadpcm.c b/libmpcodecs/ad_msadpcm.c index 64437b8ce5..6ef4bb35bb 100644 --- a/libmpcodecs/ad_msadpcm.c +++ b/libmpcodecs/ad_msadpcm.c @@ -13,7 +13,7 @@ #include "config.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "ad_internal.h" static ad_info_t info = diff --git a/libmpcodecs/native/RTjpegN.c b/libmpcodecs/native/RTjpegN.c index df3f28355b..315e01092c 100644 --- a/libmpcodecs/native/RTjpegN.c +++ b/libmpcodecs/native/RTjpegN.c @@ -32,7 +32,7 @@ #endif #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "RTjpegN.h" #ifdef MMX diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c index bc978f17e5..207d835593 100644 --- a/libmpcodecs/native/nuppelvideo.c +++ b/libmpcodecs/native/nuppelvideo.c @@ -14,7 +14,7 @@ #include "config.h" #include "mp_msg.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "../libvo/fastmemcpy.h" diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index f94bd31f18..41fc206c20 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -9,7 +9,7 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "vd_internal.h" diff --git a/libmpcodecs/vd_ijpg.c b/libmpcodecs/vd_ijpg.c index a83f87f58d..1e3b4576e3 100644 --- a/libmpcodecs/vd_ijpg.c +++ b/libmpcodecs/vd_ijpg.c @@ -12,7 +12,7 @@ #include <setjmp.h> #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "libvo/fastmemcpy.h" #include "vd_internal.h" diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c index 0412016fbc..d8725f7c08 100644 --- a/libmpcodecs/vd_mpng.c +++ b/libmpcodecs/vd_mpng.c @@ -7,7 +7,7 @@ #include <png.h> #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "libvo/fastmemcpy.h" #include "vd_internal.h" diff --git a/libmpcodecs/vd_mtga.c b/libmpcodecs/vd_mtga.c index a1dca71b22..c06e34ffd5 100644 --- a/libmpcodecs/vd_mtga.c +++ b/libmpcodecs/vd_mtga.c @@ -11,7 +11,7 @@ #include "mp_msg.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "libvo/fastmemcpy.h" #include "vd_internal.h" diff --git a/libmpcodecs/vd_sgi.c b/libmpcodecs/vd_sgi.c index 70294dafae..1496b041e3 100644 --- a/libmpcodecs/vd_sgi.c +++ b/libmpcodecs/vd_sgi.c @@ -8,7 +8,7 @@ #include "config.h" #include "mp_msg.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "vd_internal.h" #define SGI_HEADER_LEN 512 diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c index 1c8c806268..e830156836 100644 --- a/libmpcodecs/ve_qtvideo.c +++ b/libmpcodecs/ve_qtvideo.c @@ -11,7 +11,7 @@ #include "config.h" #include "mp_msg.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #ifdef WIN32_LOADER #include "ldt_keeper.h" diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c index c9bb7467ba..495169dd5a 100644 --- a/libmpcodecs/vf_divtc.c +++ b/libmpcodecs/vf_divtc.c @@ -8,7 +8,7 @@ #include "mp_msg.h" #include "cpudetect.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "img_format.h" #include "mp_image.h" diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index 6e94fb95cf..3a6d1bc725 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -4,7 +4,7 @@ //#include "config.h" /* for WORDS_BIGENDIAN */ #include <inttypes.h> #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #ifndef MIN #define MIN(a,b) (((a)<(b))?(a):(b)) diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 2b62fe488a..13be07430f 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -3,7 +3,7 @@ //#include "config.h" /* get correct definition WORDS_BIGENDIAN */ #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #ifndef MIN #define MIN(a,b) (((a)<(b))?(a):(b)) diff --git a/libmpdemux/demux_mpc.c b/libmpdemux/demux_mpc.c index 316a1c1e7d..fb0678c01e 100644 --- a/libmpdemux/demux_mpc.c +++ b/libmpdemux/demux_mpc.c @@ -12,7 +12,7 @@ #include <string.h> #include "mp_msg.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "stream.h" #include "demuxer.h" #include "stheader.h" diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c index 8835243283..cd466d835d 100644 --- a/libmpdemux/demux_vqf.c +++ b/libmpdemux/demux_vqf.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <stdio.h> #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "stream.h" #include "demuxer.h" diff --git a/libmpdemux/ebml.c b/libmpdemux/ebml.c index df1fda647b..f88fdfd4c3 100644 --- a/libmpdemux/ebml.c +++ b/libmpdemux/ebml.c @@ -12,7 +12,7 @@ #include "stream.h" #include "ebml.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "libavutil/intfloat_readwrite.h" diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 6f91b72548..167687f993 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -29,7 +29,7 @@ #endif #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "font_load.h" #include "mp_msg.h" #include "mplayer.h" diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 024420e943..ea240abd5d 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -40,7 +40,7 @@ #include "fastmemcpy.h" #include "sub.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "aspect.h" #include "vesa_lvo.h" #ifdef CONFIG_VIDIX diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index b7d6dceca1..5fdab721a7 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -25,7 +25,7 @@ #include "huffman.h" #include "mp3.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "cpudetect.h" //#include "liba52/mm_accel.h" #include "mp_msg.h" diff --git a/mpbswap.h b/mpbswap.h new file mode 100644 index 0000000000..a8565fa8d8 --- /dev/null +++ b/mpbswap.h @@ -0,0 +1,8 @@ +#ifndef MPBSWAP_H +#define MPBSWAP_H + +#define always_inline inline +#include "libavutil/bswap.h" +#undef always_inline + +#endif /* MPBSWAP_H */ diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c index 2d6140e8f6..a0c92a87fc 100644 --- a/stream/realrtsp/real.c +++ b/stream/realrtsp/real.c @@ -32,7 +32,7 @@ #include "../config.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "real.h" #include "asmrp.h" #include "sdpplin.h" diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 3601a46725..efb9afcb7f 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -7,7 +7,7 @@ #include "m_option.h" #include "m_struct.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "libmpdemux/demuxer.h" #include "cdd.h" diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c index f8205ae87c..78af5d632f 100644 --- a/stream/stream_netstream.c +++ b/stream/stream_netstream.c @@ -61,7 +61,7 @@ #include "m_option.h" #include "m_struct.h" #include "libavutil/common.h" -#include "libavutil/bswap.h" +#include "mpbswap.h" #include "netstream.h" #include "tcp.h" diff --git a/vidix/drivers/mach64_vid.c b/vidix/drivers/mach64_vid.c index 09a620e7e6..a1d068f545 100644 --- a/vidix/drivers/mach64_vid.c +++ b/vidix/drivers/mach64_vid.c @@ -15,7 +15,7 @@ #include "../../config.h" #include "../../libavutil/common.h" -#include "../../libavutil/bswap.h" +#include "../../mpbswap.h" #include "../vidix.h" #include "../fourcc.h" #include "../../libdha/libdha.h" diff --git a/vidix/drivers/nvidia_vid.c b/vidix/drivers/nvidia_vid.c index 3518526bd5..8a5376b77f 100644 --- a/vidix/drivers/nvidia_vid.c +++ b/vidix/drivers/nvidia_vid.c @@ -25,7 +25,7 @@ #include "../../libdha/pci_names.h" #include "../../config.h" #include "../../libavutil/common.h" -#include "../../libavutil/bswap.h" +#include "../../mpbswap.h" pciinfo_t pci_info; diff --git a/vidix/drivers/radeon_vid.c b/vidix/drivers/radeon_vid.c index d0730b7582..5edf7b066c 100644 --- a/vidix/drivers/radeon_vid.c +++ b/vidix/drivers/radeon_vid.c @@ -18,7 +18,7 @@ #include "../../config.h" #include "../../libavutil/common.h" -#include "../../libavutil/bswap.h" +#include "../../mpbswap.h" #include "../../libdha/pci_ids.h" #include "../../libdha/pci_names.h" #include "../vidix.h" diff --git a/vidix/vidixlib.c b/vidix/vidixlib.c index 7b23de512d..90e1cd2879 100644 --- a/vidix/vidixlib.c +++ b/vidix/vidixlib.c @@ -45,7 +45,7 @@ static char* dlerror(){ #include "vidixlib.h" #include "../config.h" #include "../libavutil/common.h" -#include "../libavutil/bswap.h" +#include "../mpbswap.h" static char drv_name[FILENAME_MAX]; |