summaryrefslogtreecommitdiffstats
path: root/stream/stream.c
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 /stream/stream.c
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 'stream/stream.c')
-rw-r--r--stream/stream.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/stream.c b/stream/stream.c
index 99225ca3b4..772c87dd9c 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -30,6 +30,9 @@
#include <strings.h>
#include <assert.h>
+#include <libavutil/intreadwrite.h>
+#include <libavutil/common.h>
+
#include "talloc.h"
#include "config.h"
@@ -38,15 +41,12 @@
#include <winsock2.h>
#endif
-#include <libavutil/common.h>
-
#include "mp_msg.h"
#include "osdep/shmem.h"
#include "osdep/timer.h"
#include "network.h"
#include "stream.h"
#include "libmpdemux/demuxer.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "m_option.h"
#include "m_struct.h"