Thu Dec 7 12:58:09 CET 2006

Author: reimar
Date: Thu Dec  7 12:58:07 2006
New Revision: 21523

Added:
   trunk/mpbswap.h
Modified:
   trunk/TOOLS/subfont-c/subfont.c
   trunk/libaf/af_format.c
   trunk/libao2/ao_dxr2.c
   trunk/libao2/ao_pcm.c
   trunk/libdha/sysdep/pci_linux.c
   trunk/libmpcodecs/ad_dk3adpcm.c
   trunk/libmpcodecs/ad_ffmpeg.c
   trunk/libmpcodecs/ad_imaadpcm.c
   trunk/libmpcodecs/ad_liba52.c
   trunk/libmpcodecs/ad_msadpcm.c
   trunk/libmpcodecs/native/RTjpegN.c
   trunk/libmpcodecs/native/nuppelvideo.c
   trunk/libmpcodecs/vd_ffmpeg.c
   trunk/libmpcodecs/vd_ijpg.c
   trunk/libmpcodecs/vd_mpng.c
   trunk/libmpcodecs/vd_mtga.c
   trunk/libmpcodecs/vd_sgi.c
   trunk/libmpcodecs/ve_qtvideo.c
   trunk/libmpcodecs/vf_divtc.c
   trunk/libmpdemux/asf.h
   trunk/libmpdemux/aviheader.h
   trunk/libmpdemux/demux_mpc.c
   trunk/libmpdemux/demux_vqf.c
   trunk/libmpdemux/ebml.c
   trunk/libvo/font_load_ft.c
   trunk/libvo/vo_vesa.c
   trunk/mp3lib/sr1.c
   trunk/stream/realrtsp/real.c
   trunk/stream/stream_cdda.c
   trunk/stream/stream_netstream.c
   trunk/vidix/drivers/mach64_vid.c
   trunk/vidix/drivers/nvidia_vid.c
   trunk/vidix/drivers/radeon_vid.c
   trunk/vidix/vidixlib.c

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


Modified: trunk/TOOLS/subfont-c/subfont.c
==============================================================================

--- trunk/TOOLS/subfont-c/subfont.c	(original)
+++ trunk/TOOLS/subfont-c/subfont.c	Thu Dec  7 12:58:07 2006
@@ -27,7 +27,7 @@
 
 
 #include "libavutil/common.h"
-#include "libavutil/bswap.h"
+#include "mpbswap.h"
 #include "osdep/timer.h"
 
 #ifndef DEBUG

Modified: trunk/libaf/af_format.c
==============================================================================
--- trunk/libaf/af_format.c	(original)
+++ trunk/libaf/af_format.c	Thu Dec  7 12:58:07 2006
@@ -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

Modified: trunk/libao2/ao_dxr2.c
==============================================================================
--- trunk/libao2/ao_dxr2.c	(original)
+++ trunk/libao2/ao_dxr2.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/libao2/ao_pcm.c
==============================================================================
--- trunk/libao2/ao_pcm.c	(original)
+++ trunk/libao2/ao_pcm.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/libdha/sysdep/pci_linux.c
==============================================================================
--- trunk/libdha/sysdep/pci_linux.c	(original)
+++ trunk/libdha/sysdep/pci_linux.c	Thu Dec  7 12:58:07 2006
@@ -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,

Modified: trunk/libmpcodecs/ad_dk3adpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_dk3adpcm.c	(original)
+++ trunk/libmpcodecs/ad_dk3adpcm.c	Thu Dec  7 12:58:07 2006
@@ -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 = 

Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c	(original)
+++ trunk/libmpcodecs/ad_ffmpeg.c	Thu Dec  7 12:58:07 2006
@@ -8,7 +8,7 @@
 
 #include "ad_internal.h"
 
-#include "libavutil/bswap.h"
+#include "mpbswap.h"
 
 static ad_info_t info = 
 {

Modified: trunk/libmpcodecs/ad_imaadpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_imaadpcm.c	(original)
+++ trunk/libmpcodecs/ad_imaadpcm.c	Thu Dec  7 12:58:07 2006
@@ -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

Modified: trunk/libmpcodecs/ad_liba52.c
==============================================================================
--- trunk/libmpcodecs/ad_liba52.c	(original)
+++ trunk/libmpcodecs/ad_liba52.c	Thu Dec  7 12:58:07 2006
@@ -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 = 
 {

Modified: trunk/libmpcodecs/ad_msadpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_msadpcm.c	(original)
+++ trunk/libmpcodecs/ad_msadpcm.c	Thu Dec  7 12:58:07 2006
@@ -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 = 

Modified: trunk/libmpcodecs/native/RTjpegN.c
==============================================================================
--- trunk/libmpcodecs/native/RTjpegN.c	(original)
+++ trunk/libmpcodecs/native/RTjpegN.c	Thu Dec  7 12:58:07 2006
@@ -32,7 +32,7 @@
 #endif
 
 #include "libavutil/common.h"
-#include "libavutil/bswap.h"
+#include "mpbswap.h"
 #include "RTjpegN.h"
 
 #ifdef MMX

Modified: trunk/libmpcodecs/native/nuppelvideo.c
==============================================================================
--- trunk/libmpcodecs/native/nuppelvideo.c	(original)
+++ trunk/libmpcodecs/native/nuppelvideo.c	Thu Dec  7 12:58:07 2006
@@ -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"
 

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	(original)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Thu Dec  7 12:58:07 2006
@@ -9,7 +9,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/bswap.h"
+#include "mpbswap.h"
 
 #include "vd_internal.h"
 

Modified: trunk/libmpcodecs/vd_ijpg.c
==============================================================================
--- trunk/libmpcodecs/vd_ijpg.c	(original)
+++ trunk/libmpcodecs/vd_ijpg.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/libmpcodecs/vd_mpng.c
==============================================================================
--- trunk/libmpcodecs/vd_mpng.c	(original)
+++ trunk/libmpcodecs/vd_mpng.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/libmpcodecs/vd_mtga.c
==============================================================================
--- trunk/libmpcodecs/vd_mtga.c	(original)
+++ trunk/libmpcodecs/vd_mtga.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/libmpcodecs/vd_sgi.c
==============================================================================
--- trunk/libmpcodecs/vd_sgi.c	(original)
+++ trunk/libmpcodecs/vd_sgi.c	Thu Dec  7 12:58:07 2006
@@ -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

Modified: trunk/libmpcodecs/ve_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/ve_qtvideo.c	(original)
+++ trunk/libmpcodecs/ve_qtvideo.c	Thu Dec  7 12:58:07 2006
@@ -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" 

Modified: trunk/libmpcodecs/vf_divtc.c
==============================================================================
--- trunk/libmpcodecs/vf_divtc.c	(original)
+++ trunk/libmpcodecs/vf_divtc.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/libmpdemux/asf.h
==============================================================================
--- trunk/libmpdemux/asf.h	(original)
+++ trunk/libmpdemux/asf.h	Thu Dec  7 12:58:07 2006
@@ -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))

Modified: trunk/libmpdemux/aviheader.h
==============================================================================
--- trunk/libmpdemux/aviheader.h	(original)
+++ trunk/libmpdemux/aviheader.h	Thu Dec  7 12:58:07 2006
@@ -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))

Modified: trunk/libmpdemux/demux_mpc.c
==============================================================================
--- trunk/libmpdemux/demux_mpc.c	(original)
+++ trunk/libmpdemux/demux_mpc.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/libmpdemux/demux_vqf.c
==============================================================================
--- trunk/libmpdemux/demux_vqf.c	(original)
+++ trunk/libmpdemux/demux_vqf.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/libmpdemux/ebml.c
==============================================================================
--- trunk/libmpdemux/ebml.c	(original)
+++ trunk/libmpdemux/ebml.c	Thu Dec  7 12:58:07 2006
@@ -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"
 
 

Modified: trunk/libvo/font_load_ft.c
==============================================================================
--- trunk/libvo/font_load_ft.c	(original)
+++ trunk/libvo/font_load_ft.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/libvo/vo_vesa.c
==============================================================================
--- trunk/libvo/vo_vesa.c	(original)
+++ trunk/libvo/vo_vesa.c	Thu Dec  7 12:58:07 2006
@@ -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

Modified: trunk/mp3lib/sr1.c
==============================================================================
--- trunk/mp3lib/sr1.c	(original)
+++ trunk/mp3lib/sr1.c	Thu Dec  7 12:58:07 2006
@@ -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"

Added: trunk/mpbswap.h
==============================================================================
--- (empty file)
+++ trunk/mpbswap.h	Thu Dec  7 12:58:07 2006
@@ -0,0 +1,8 @@
+#ifndef MPBSWAP_H
+#define MPBSWAP_H
+
+#define always_inline inline
+#include "libavutil/bswap.h"
+#undef always_inline
+
+#endif /* MPBSWAP_H */

Modified: trunk/stream/realrtsp/real.c
==============================================================================
--- trunk/stream/realrtsp/real.c	(original)
+++ trunk/stream/realrtsp/real.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/stream/stream_cdda.c
==============================================================================
--- trunk/stream/stream_cdda.c	(original)
+++ trunk/stream/stream_cdda.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/stream/stream_netstream.c
==============================================================================
--- trunk/stream/stream_netstream.c	(original)
+++ trunk/stream/stream_netstream.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/vidix/drivers/mach64_vid.c
==============================================================================
--- trunk/vidix/drivers/mach64_vid.c	(original)
+++ trunk/vidix/drivers/mach64_vid.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/vidix/drivers/nvidia_vid.c
==============================================================================
--- trunk/vidix/drivers/nvidia_vid.c	(original)
+++ trunk/vidix/drivers/nvidia_vid.c	Thu Dec  7 12:58:07 2006
@@ -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;

Modified: trunk/vidix/drivers/radeon_vid.c
==============================================================================
--- trunk/vidix/drivers/radeon_vid.c	(original)
+++ trunk/vidix/drivers/radeon_vid.c	Thu Dec  7 12:58:07 2006
@@ -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"

Modified: trunk/vidix/vidixlib.c
==============================================================================
--- trunk/vidix/vidixlib.c	(original)
+++ trunk/vidix/vidixlib.c	Thu Dec  7 12:58:07 2006
@@ -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];
 

