summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-02-01 20:01:16 +0200
committerUoti Urpala <uau@mplayer2.org>2012-02-01 22:46:27 +0200
commitfc6a9e4a3e0278e1a1f5c0bf570667306f716fed (patch)
treed94999fc238126f28c4c5e88c341829001b226df /sub
parentcdb6d157ccb2d311afb72b7cbf128c3866e85ec6 (diff)
downloadmpv-fc6a9e4a3e0278e1a1f5c0bf570667306f716fed.tar.bz2
mpv-fc6a9e4a3e0278e1a1f5c0bf570667306f716fed.tar.xz
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.
Diffstat (limited to 'sub')
-rw-r--r--sub/spudec.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sub/spudec.c b/sub/spudec.c
index 48e219a930..a871aa3cd9 100644
--- a/sub/spudec.c
+++ b/sub/spudec.c
@@ -27,9 +27,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
-#include "mp_msg.h"
-
#include <errno.h>
#include <limits.h>
#include <stdio.h>
@@ -37,12 +34,17 @@
#include <unistd.h>
#include <string.h>
#include <math.h>
+
+#include <libavutil/avutil.h>
+#include <libavutil/intreadwrite.h>
+#include <libswscale/swscale.h>
+
+#include "config.h"
+#include "mp_msg.h"
+
#include "libvo/video_out.h"
#include "spudec.h"
#include "vobsub.h"
-#include "libavutil/avutil.h"
-#include "ffmpeg_files/intreadwrite.h"
-#include "libswscale/swscale.h"
#include "mpcommon.h"
/* Valid values for spu_aamode: