Remove bswap.h, use libavutil/bswap.h instead.

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

36 files changed, 63 insertions, 94 deletions

diff --git a/bswap.h b/bswap.h
deleted file mode 100644
index 1eacb2e056..0000000000
--- a/bswap.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef __MP_BSWAP_H__
-#define __MP_BSWAP_H__
-
-#include "libavutil/common.h"
-#include "libavutil/bswap.h"
-
-static inline float bswap_flt(float x) {
-  union {uint32_t i; float f;} u;
-  u.f = x;
-  u.i = bswap_32(u.i);
-  return u.f;
-}
-
-static inline double bswap_dbl(double x) {
-  union {uint64_t i; double d;} u;
-  u.d = x;
-  u.i = bswap_64(u.i);
-  return u.d;
-}
-
-static inline long double bswap_ldbl(long double x) {
-  union {char d[10]; long double ld;} uin;
-  union {char d[10]; long double ld;} uout;
-  uin.ld = x;
-  uout.d[0] = uin.d[9];
-  uout.d[1] = uin.d[8];
-  uout.d[2] = uin.d[7];
-  uout.d[3] = uin.d[6];
-  uout.d[4] = uin.d[5];
-  uout.d[5] = uin.d[4];
-  uout.d[6] = uin.d[3];
-  uout.d[7] = uin.d[2];
-  uout.d[8] = uin.d[1];
-  uout.d[9] = uin.d[0];
-  return uout.ld;
-}
-
-// be2me ... BigEndian to MachineEndian
-// le2me ... LittleEndian to MachineEndian
-
-#ifdef WORDS_BIGENDIAN
-#define be2me_flt(x) (x)
-#define be2me_dbl(x) (x)
-#define be2me_ldbl(x) (x)
-#define le2me_flt(x) bswap_flt(x)
-#define le2me_dbl(x) bswap_dbl(x)
-#define le2me_ldbl(x) bswap_ldbl(x)
-#else
-#define be2me_flt(x) bswap_flt(x)
-#define be2me_dbl(x) bswap_dbl(x)
-#define be2me_ldbl(x) bswap_ldbl(x)
-#define le2me_flt(x) (x)
-#define le2me_dbl(x) (x)
-#define le2me_ldbl(x) (x)
-#endif
-
-#endif /* __MP_BSWAP_H__ */
diff --git a/libaf/af_format.c b/libaf/af_format.c
index 486758b08c..4b1427197a 100644
--- a/libaf/af_format.c
+++ b/libaf/af_format.c
@@ -22,7 +22,8 @@ long int lrintf(float);
 #endif
 
 #include "af.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.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 013173e37a..1e68a7d261 100644
--- a/libao2/ao_dxr2.c
+++ b/libao2/ao_dxr2.c
@@ -7,7 +7,8 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c
index 0dbd7bbe0a..70cb46eda8 100644
--- a/libao2/ao_pcm.c
+++ b/libao2/ao_pcm.c
@@ -4,7 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.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 0362d92579..68393ae093 100644
--- a/libdha/sysdep/pci_linux.c
+++ b/libdha/sysdep/pci_linux.c
@@ -132,7 +132,8 @@ static int pci_config_type( void ) { return 1; }
 #include <fcntl.h>
 //#include <sys/io.h>
 #include <linux/pci.h>
-#include "../../bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 static int pci_get_vendor(
           unsigned char bus,
diff --git a/libmpcodecs/ad_dk3adpcm.c b/libmpcodecs/ad_dk3adpcm.c
index 3676fc08c8..d2410f1a44 100644
--- a/libmpcodecs/ad_dk3adpcm.c
+++ b/libmpcodecs/ad_dk3adpcm.c
@@ -16,7 +16,8 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "ad_internal.h"
 
 static ad_info_t info = 
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index 20ef2f2e53..3b863de0d8 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -8,7 +8,7 @@
 
 #include "ad_internal.h"
 
-#include "bswap.h"
+#include "libavutil/bswap.h"
 
 static ad_info_t info = 
 {
diff --git a/libmpcodecs/ad_imaadpcm.c b/libmpcodecs/ad_imaadpcm.c
index ce182bf80e..236c82fff2 100644
--- a/libmpcodecs/ad_imaadpcm.c
+++ b/libmpcodecs/ad_imaadpcm.c
@@ -21,7 +21,8 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.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 7ba07623f7..c889484cf8 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 "bswap.h"
+#include "libavutil/bswap.h"
 
 static ad_info_t info = 
 {
diff --git a/libmpcodecs/ad_msadpcm.c b/libmpcodecs/ad_msadpcm.c
index 6dc250235f..64437b8ce5 100644
--- a/libmpcodecs/ad_msadpcm.c
+++ b/libmpcodecs/ad_msadpcm.c
@@ -12,7 +12,8 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "ad_internal.h"
 
 static ad_info_t info = 
diff --git a/libmpcodecs/native/RTjpegN.c b/libmpcodecs/native/RTjpegN.c
index 82203c3f71..df3f28355b 100644
--- a/libmpcodecs/native/RTjpegN.c
+++ b/libmpcodecs/native/RTjpegN.c
@@ -31,7 +31,8 @@
 #define MMX
 #endif
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "RTjpegN.h"
 
 #ifdef MMX
diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c
index 2dd4ee09da..bc978f17e5 100644
--- a/libmpcodecs/native/nuppelvideo.c
+++ b/libmpcodecs/native/nuppelvideo.c
@@ -13,7 +13,8 @@
 
 #include "config.h"
 #include "mp_msg.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "../libvo/fastmemcpy.h"
 
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 6b96ced2e8..b12319336c 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -7,7 +7,8 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "vd_internal.h"
 
diff --git a/libmpcodecs/vd_ijpg.c b/libmpcodecs/vd_ijpg.c
index 139a71b9be..a83f87f58d 100644
--- a/libmpcodecs/vd_ijpg.c
+++ b/libmpcodecs/vd_ijpg.c
@@ -11,7 +11,8 @@
 
 #include <setjmp.h>
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "libvo/fastmemcpy.h"
 
 #include "vd_internal.h"
diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c
index 9d99145ee6..0412016fbc 100644
--- a/libmpcodecs/vd_mpng.c
+++ b/libmpcodecs/vd_mpng.c
@@ -6,7 +6,8 @@
 
 #include <png.h>
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "libvo/fastmemcpy.h"
 
 #include "vd_internal.h"
diff --git a/libmpcodecs/vd_mtga.c b/libmpcodecs/vd_mtga.c
index cbd44d5e28..a1dca71b22 100644
--- a/libmpcodecs/vd_mtga.c
+++ b/libmpcodecs/vd_mtga.c
@@ -10,7 +10,8 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "libvo/fastmemcpy.h"
 
 #include "vd_internal.h"
diff --git a/libmpcodecs/vd_sgi.c b/libmpcodecs/vd_sgi.c
index 84d45ac494..70294dafae 100644
--- a/libmpcodecs/vd_sgi.c
+++ b/libmpcodecs/vd_sgi.c
@@ -7,7 +7,8 @@
 
 #include "config.h"
 #include "mp_msg.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "vd_internal.h"
 
 #define SGI_HEADER_LEN 512
diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c
index da73cde792..1c8c806268 100644
--- a/libmpcodecs/ve_qtvideo.c
+++ b/libmpcodecs/ve_qtvideo.c
@@ -10,7 +10,8 @@
 
 #include "config.h"
 #include "mp_msg.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #ifdef WIN32_LOADER 
 #include "ldt_keeper.h" 
diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c
index 2b0b4e6377..c9bb7467ba 100644
--- a/libmpcodecs/vf_divtc.c
+++ b/libmpcodecs/vf_divtc.c
@@ -7,7 +7,8 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h
index 893ea2dcb7..6e94fb95cf 100644
--- a/libmpdemux/asf.h
+++ b/libmpdemux/asf.h
@@ -3,7 +3,8 @@
 
 //#include "config.h"	/* for WORDS_BIGENDIAN */
 #include <inttypes.h>
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c
index 2055ff6ef4..089daef7e0 100644
--- a/libmpdemux/aviheader.c
+++ b/libmpdemux/aviheader.c
@@ -12,7 +12,6 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "bswap.h"
 #include "aviheader.h"
 
 #define MIN(a,b) (((a)<(b))?(a):(b))
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h
index 035aa6d28b..2b62fe488a 100644
--- a/libmpdemux/aviheader.h
+++ b/libmpdemux/aviheader.h
@@ -2,7 +2,8 @@
 #define	_aviheader_h
 
 //#include "config.h"	/* get correct definition WORDS_BIGENDIAN */
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))
diff --git a/libmpdemux/demux_mpc.c b/libmpdemux/demux_mpc.c
index 7fb3a2a92c..316a1c1e7d 100644
--- a/libmpdemux/demux_mpc.c
+++ b/libmpdemux/demux_mpc.c
@@ -11,7 +11,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "mp_msg.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c
index 64966e560b..8835243283 100644
--- a/libmpdemux/demux_vqf.c
+++ b/libmpdemux/demux_vqf.c
@@ -2,7 +2,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "stream.h"
 #include "demuxer.h"
diff --git a/libmpdemux/ebml.c b/libmpdemux/ebml.c
index 2b8f66cddf..af69e61aaf 100644
--- a/libmpdemux/ebml.c
+++ b/libmpdemux/ebml.c
@@ -11,7 +11,8 @@
 
 #include "stream.h"
 #include "ebml.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 
 #ifndef SIZE_MAX
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index 7edeb1a72c..e06ff6abe6 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -9,7 +9,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "bswap.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
 
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index b2a4183d0b..31c176e7e5 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -9,8 +9,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "bswap.h"
-
 #include "aviheader.h"
 #include "ms_hdr.h"
 
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index d068e046fe..13529334cd 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -28,7 +28,8 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "font_load.h"
 #include "mp_msg.h"
 #include "mplayer.h"
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index e5e6395290..b7d6dceca1 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -24,7 +24,8 @@
 #include "mpg123.h"
 #include "huffman.h"
 #include "mp3.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "cpudetect.h"
 //#include "liba52/mm_accel.h"
 #include "mp_msg.h"
diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c
index f3c09a364d..2d6140e8f6 100644
--- a/stream/realrtsp/real.c
+++ b/stream/realrtsp/real.c
@@ -31,7 +31,8 @@
 #include <string.h>
 
 #include "../config.h"
-#include "../bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "real.h"
 #include "asmrp.h"
 #include "sdpplin.h"
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 081667c819..8333acc618 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -3,7 +3,8 @@
 #include "stream.h"
 #include "m_option.h"
 #include "m_struct.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index a9a789eb9c..f8205ae87c 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -60,7 +60,8 @@
 #include "help_mp.h"
 #include "m_option.h"
 #include "m_struct.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "netstream.h"
 #include "tcp.h"
diff --git a/vidix/drivers/mach64_vid.c b/vidix/drivers/mach64_vid.c
index 1c43bdeef4..09a620e7e6 100644
--- a/vidix/drivers/mach64_vid.c
+++ b/vidix/drivers/mach64_vid.c
@@ -14,7 +14,8 @@
 #include <fcntl.h>
 
 #include "../../config.h"
-#include "../../bswap.h"
+#include "../../libavutil/common.h"
+#include "../../libavutil/bswap.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 dd887dd07f..3518526bd5 100644
--- a/vidix/drivers/nvidia_vid.c
+++ b/vidix/drivers/nvidia_vid.c
@@ -24,7 +24,8 @@
 #include "../../libdha/pci_ids.h"
 #include "../../libdha/pci_names.h"
 #include "../../config.h"
-#include "../../bswap.h"
+#include "../../libavutil/common.h"
+#include "../../libavutil/bswap.h"
 
 
 pciinfo_t pci_info;
diff --git a/vidix/drivers/radeon_vid.c b/vidix/drivers/radeon_vid.c
index 14c4072f98..d0730b7582 100644
--- a/vidix/drivers/radeon_vid.c
+++ b/vidix/drivers/radeon_vid.c
@@ -17,7 +17,8 @@
 #include <inttypes.h>
 
 #include "../../config.h"
-#include "../../bswap.h"
+#include "../../libavutil/common.h"
+#include "../../libavutil/bswap.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 40c164729f..7b23de512d 100644
--- a/vidix/vidixlib.c
+++ b/vidix/vidixlib.c
@@ -43,8 +43,9 @@ static char* dlerror(){
 #endif
 
 #include "vidixlib.h"
-#include "../config.h" 
-#include "../bswap.h"
+#include "../config.h"
+#include "../libavutil/common.h"
+#include "../libavutil/bswap.h"
 
 static char drv_name[FILENAME_MAX];