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_mov.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_mov.c')
| -rw-r--r-- | libmpdemux/demux_mov.c | 21 |
1 files changed, 11 insertions, 10 deletions
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)]) |