Hack around libavutil/bswap.h compilation problems due to always_inline undefined.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2

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

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

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"

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"

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,

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 = 

libmpcodecs/ad_ffmpeg.c

@@ -8,7 +8,7 @@
 
 #include "ad_internal.h"
 
-#include "libavutil/bswap.h"
+#include "mpbswap.h"
 
 static ad_info_t info = 
 {

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

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 = 
 {

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 = 

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

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"
 

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"
 

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"

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"

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"

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

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" 

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"

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))

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))

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"

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"

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"
 
 

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"

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

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"

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 */

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"

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"

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"

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"

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;

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"

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];