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

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

14 files changed, 26 insertions, 14 deletions

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"