build: switch to libavutil bswap.h and intreadwrite.h

Remove the private bswap and intreadwrite.h implementations and use
libavutil headers instead.

Originally these headers weren't publicly installed by libavutil at
all. That already changed in 2010, but the pure C bswap version in
installed headers was very inefficient. That was recently (2011-12)
improved and now using the public bswap version probably shouldn't
cause noticeable performance problems, at least if using a new enough
compiler.

9 files changed, 43 insertions, 37 deletions

diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index 857a899bef..bd775b7660 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -22,9 +22,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <libavutil/intreadwrite.h>
+#include <libavutil/common.h>
+
 #include "config.h"
-#include "libavutil/common.h"
-#include "ffmpeg_files/intreadwrite.h"
 #include "mp_msg.h"
 
 #include "stream/stream.h"
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index c10fd3e14b..eb71d4ef96 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -24,6 +24,8 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <libavutil/intreadwrite.h>
+
 #include "config.h"
 #include "mp_msg.h"
 
@@ -33,7 +35,6 @@
 #include "demuxer.h"
 #include "libmpcodecs/dec_audio.h"
 #include "libvo/fastmemcpy.h"
-#include "ffmpeg_files/intreadwrite.h"
 
 // based on asf file-format doc by Eugene [http://divx.euro.ru]
 
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 815d3aec9c..bc14b530c1 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -16,21 +16,22 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <libavutil/intreadwrite.h>
+
 #include "config.h"
 #include "options.h"
 #include "mp_msg.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include "stream/stream.h"
 #include "aviprint.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "genres.h"
 #include "mp3_hdr.h"
-#include "ffmpeg_files/intreadwrite.h"
-
-#include <string.h>
 
 #define MP3 1
 #define WAV 2
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 00990f50d4..27bc45acc9 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -21,14 +21,23 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <inttypes.h>
 #include <stdbool.h>
 
+#include <libavutil/common.h>
+#include <libavutil/lzo.h>
+#include <libavutil/intreadwrite.h>
+#include <libavutil/avstring.h>
+
+#include "config.h"
+
+#if CONFIG_ZLIB
+#include <zlib.h>
+#endif
+
 #include "talloc.h"
 #include "options.h"
 #include "bstr.h"
@@ -43,20 +52,11 @@
 
 #include "sub/sub.h"
 
-#include "libavutil/common.h"
 
 #ifdef CONFIG_QTX_CODECS
 #include "loader/qtx/qtxsdk/components.h"
 #endif
 
-#if CONFIG_ZLIB
-#include <zlib.h>
-#endif
-
-#include "libavutil/lzo.h"
-#include "ffmpeg_files/intreadwrite.h"
-#include "libavutil/avstring.h"
-
 static const unsigned char sipr_swaps[38][2] = {
     {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68},
     {13,39},{14,73},{15,53},{16,69},{17,57},{19,88},{20,34},{21,71},{24,46},
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 521b499ff6..bccf808465 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -44,6 +44,9 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <libavutil/common.h>
+#include <libavutil/intreadwrite.h>
+
 #include "config.h"
 
 #ifdef CONFIG_QUICKTIME
@@ -54,6 +57,14 @@
 #include "loader/qtx/qtxsdk/components.h"
 #endif
 
+#if CONFIG_ZLIB
+#include <zlib.h>
+#endif
+
+#ifndef _FCNTL_H
+#include <fcntl.h>
+#endif
+
 #include "mp_msg.h"
 
 #include "stream/stream.h"
@@ -61,8 +72,6 @@
 #include "stheader.h"
 
 #include "libmpcodecs/img_format.h"
-#include "libavutil/common.h"
-#include "ffmpeg_files/intreadwrite.h"
 
 #include "sub/sub.h"
 
@@ -70,14 +79,6 @@
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 
-#if CONFIG_ZLIB
-#include <zlib.h>
-#endif
-
-#ifndef _FCNTL_H
-#include <fcntl.h>
-#endif
-
 #define char2short(x,y)	AV_RB16(&(x)[(y)])
 #define char2int(x,y) 	AV_RB32(&(x)[(y)])
 
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 61828fd9d7..d38d68cb79 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -25,13 +25,14 @@
 #include <math.h>
 #include <inttypes.h>
 
+#include <libavutil/intreadwrite.h>
+
 #include "options.h"
 #include "mp_msg.h"
 #include "talloc.h"
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "ffmpeg_files/intreadwrite.h"
 #include "aviprint.h"
 #include "demux_mov.h"
 #include "demux_ogg.h"
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index d68dfb2b8e..687441f863 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -39,11 +39,12 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <libavutil/intreadwrite.h>
+#include <libavutil/common.h>
+
 #include "config.h"
 #include "mp_msg.h"
 #include "mpbswap.h"
-#include "libavutil/common.h"
-#include "ffmpeg_files/intreadwrite.h"
 #include "stream/stream.h"
 #include "aviprint.h"
 #include "demuxer.h"
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c
index f81ea3d57b..7664eddc98 100644
--- a/libmpdemux/demux_ty.c
+++ b/libmpdemux/demux_ty.c
@@ -35,6 +35,9 @@
 #include <time.h>
 #include <stdarg.h>
 
+#include <libavutil/avstring.h>
+#include <libavutil/intreadwrite.h>
+
 #include "config.h"
 #include "mp_msg.h"
 
@@ -47,8 +50,6 @@
 #include "parse_es.h"
 #include "stheader.h"
 #include "sub/sub_cc.h"
-#include "libavutil/avstring.h"
-#include "ffmpeg_files/intreadwrite.h"
 
 extern int sub_justify;
 
diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c
index 8a3cff66b7..051e912339 100644
--- a/libmpdemux/demux_vqf.c
+++ b/libmpdemux/demux_vqf.c
@@ -20,9 +20,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "libavutil/common.h"
-#include "ffmpeg_files/intreadwrite.h"
-#include "mpbswap.h"
+#include <libavutil/common.h>
+#include <libavutil/intreadwrite.h>
 
 #include "stream/stream.h"
 #include "demuxer.h"