diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-02-01 20:01:16 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-02-01 22:46:27 +0200 |
| commit | fc6a9e4a3e0278e1a1f5c0bf570667306f716fed (patch) | |
| tree | d94999fc238126f28c4c5e88c341829001b226df /libmpdemux/demux_mkv.c | |
| parent | cdb6d157ccb2d311afb72b7cbf128c3866e85ec6 (diff) | |
| download | mpv-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 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 22 |
1 files changed, 11 insertions, 11 deletions
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}, |