# HG changeset patch
# User reimar
# Date 1165492687 0
# Node ID fa99b3d31d137f651b587762b34284f3276cf95d
# Parent  8174acbf06338f08e94943a5aef8a9490460f2ce
Hack around libavutil/bswap.h compilation problems due to always_inline undefined.

diff -r 8174acbf0633 -r fa99b3d31d13 TOOLS/subfont-c/subfont.c
--- a/TOOLS/subfont-c/subfont.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/TOOLS/subfont-c/subfont.c	Thu Dec 07 11:58:07 2006 +0000
@@ -27,7 +27,7 @@
 
 
 #include "libavutil/common.h"
-#include "libavutil/bswap.h"
+#include "mpbswap.h"
 #include "osdep/timer.h"
 
 #ifndef DEBUG
diff -r 8174acbf0633 -r fa99b3d31d13 libaf/af_format.c
--- a/libaf/af_format.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libaf/af_format.c	Thu Dec 07 11:58:07 2006 +0000
@@ -23,7 +23,7 @@
 
 #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 -r 8174acbf0633 -r fa99b3d31d13 libao2/ao_dxr2.c
--- a/libao2/ao_dxr2.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libao2/ao_dxr2.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libao2/ao_pcm.c
--- a/libao2/ao_pcm.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libao2/ao_pcm.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libdha/sysdep/pci_linux.c
--- a/libdha/sysdep/pci_linux.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libdha/sysdep/pci_linux.c	Thu Dec 07 11:58:07 2006 +0000
@@ -133,7 +133,7 @@
 //#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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/ad_dk3adpcm.c
--- a/libmpcodecs/ad_dk3adpcm.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/ad_dk3adpcm.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/ad_ffmpeg.c
--- a/libmpcodecs/ad_ffmpeg.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/ad_ffmpeg.c	Thu Dec 07 11:58:07 2006 +0000
@@ -8,7 +8,7 @@
 
 #include "ad_internal.h"
 
-#include "libavutil/bswap.h"
+#include "mpbswap.h"
 
 static ad_info_t info = 
 {
diff -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/ad_imaadpcm.c
--- a/libmpcodecs/ad_imaadpcm.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/ad_imaadpcm.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/ad_liba52.c
--- a/libmpcodecs/ad_liba52.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/ad_liba52.c	Thu Dec 07 11:58:07 2006 +0000
@@ -37,7 +37,7 @@
 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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/ad_msadpcm.c
--- a/libmpcodecs/ad_msadpcm.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/ad_msadpcm.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/native/RTjpegN.c
--- a/libmpcodecs/native/RTjpegN.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/native/RTjpegN.c	Thu Dec 07 11:58:07 2006 +0000
@@ -32,7 +32,7 @@
 #endif
 
 #include "libavutil/common.h"
-#include "libavutil/bswap.h"
+#include "mpbswap.h"
 #include "RTjpegN.h"
 
 #ifdef MMX
diff -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/native/nuppelvideo.c
--- a/libmpcodecs/native/nuppelvideo.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/native/nuppelvideo.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/vd_ffmpeg.c
--- a/libmpcodecs/vd_ffmpeg.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Thu Dec 07 11:58:07 2006 +0000
@@ -9,7 +9,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/bswap.h"
+#include "mpbswap.h"
 
 #include "vd_internal.h"
 
diff -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/vd_ijpg.c
--- a/libmpcodecs/vd_ijpg.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/vd_ijpg.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/vd_mpng.c
--- a/libmpcodecs/vd_mpng.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/vd_mpng.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/vd_mtga.c
--- a/libmpcodecs/vd_mtga.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/vd_mtga.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/vd_sgi.c
--- a/libmpcodecs/vd_sgi.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/vd_sgi.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/ve_qtvideo.c
--- a/libmpcodecs/ve_qtvideo.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/ve_qtvideo.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpcodecs/vf_divtc.c
--- a/libmpcodecs/vf_divtc.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpcodecs/vf_divtc.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpdemux/asf.h
--- a/libmpdemux/asf.h	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpdemux/asf.h	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpdemux/aviheader.h
--- a/libmpdemux/aviheader.h	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpdemux/aviheader.h	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpdemux/demux_mpc.c
--- a/libmpdemux/demux_mpc.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpdemux/demux_mpc.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpdemux/demux_vqf.c
--- a/libmpdemux/demux_vqf.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpdemux/demux_vqf.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libmpdemux/ebml.c
--- a/libmpdemux/ebml.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libmpdemux/ebml.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libvo/font_load_ft.c
--- a/libvo/font_load_ft.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libvo/font_load_ft.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 libvo/vo_vesa.c
--- a/libvo/vo_vesa.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/libvo/vo_vesa.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 mp3lib/sr1.c
--- a/mp3lib/sr1.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/mp3lib/sr1.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 mpbswap.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mpbswap.h	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 stream/realrtsp/real.c
--- a/stream/realrtsp/real.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/stream/realrtsp/real.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 stream/stream_cdda.c
--- a/stream/stream_cdda.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/stream/stream_cdda.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 stream/stream_netstream.c
--- a/stream/stream_netstream.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/stream/stream_netstream.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 vidix/drivers/mach64_vid.c
--- a/vidix/drivers/mach64_vid.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/vidix/drivers/mach64_vid.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 vidix/drivers/nvidia_vid.c
--- a/vidix/drivers/nvidia_vid.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/vidix/drivers/nvidia_vid.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 vidix/drivers/radeon_vid.c
--- a/vidix/drivers/radeon_vid.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/vidix/drivers/radeon_vid.c	Thu Dec 07 11:58:07 2006 +0000
@@ -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 -r 8174acbf0633 -r fa99b3d31d13 vidix/vidixlib.c
--- a/vidix/vidixlib.c	Wed Dec 06 18:44:26 2006 +0000
+++ b/vidix/vidixlib.c	Thu Dec 07 11:58:07 2006 +0000
@@ -45,7 +45,7 @@
 #include "vidixlib.h"
 #include "../config.h"
 #include "../libavutil/common.h"
-#include "../libavutil/bswap.h"
+#include "../mpbswap.h"
 
 static char drv_name[FILENAME_MAX];