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 /libmpcodecs | |
| 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 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_dk3adpcm.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/ad_hwac3.c | 5 | ||||
| -rw-r--r-- | libmpcodecs/ad_imaadpcm.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/ad_msadpcm.c | 5 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_mtga.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/vd_realvid.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/vd_sgi.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/vd_theora.c | 3 |
9 files changed, 19 insertions, 11 deletions
diff --git a/libmpcodecs/ad_dk3adpcm.c b/libmpcodecs/ad_dk3adpcm.c index d1792ee46b..15027f88b1 100644 --- a/libmpcodecs/ad_dk3adpcm.c +++ b/libmpcodecs/ad_dk3adpcm.c @@ -32,8 +32,9 @@ #include <stdlib.h> #include <unistd.h> +#include <libavutil/intreadwrite.h> + #include "config.h" -#include "ffmpeg_files/intreadwrite.h" #include "ad_internal.h" static const ad_info_t info = diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index f5d6fbc933..a11c2c90e7 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -26,11 +26,12 @@ #include <string.h> #include <unistd.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 "ad_internal.h" diff --git a/libmpcodecs/ad_imaadpcm.c b/libmpcodecs/ad_imaadpcm.c index 2ca71f29de..84f667ecd6 100644 --- a/libmpcodecs/ad_imaadpcm.c +++ b/libmpcodecs/ad_imaadpcm.c @@ -38,8 +38,9 @@ #include <unistd.h> #include <inttypes.h> +#include <libavutil/intreadwrite.h> + #include "config.h" -#include "ffmpeg_files/intreadwrite.h" #include "mpbswap.h" #include "ad_internal.h" diff --git a/libmpcodecs/ad_msadpcm.c b/libmpcodecs/ad_msadpcm.c index 162c7c04d3..eee89de2ea 100644 --- a/libmpcodecs/ad_msadpcm.c +++ b/libmpcodecs/ad_msadpcm.c @@ -28,9 +28,10 @@ #include <stdlib.h> #include <unistd.h> +#include <libavutil/common.h> +#include <libavutil/intreadwrite.h> + #include "config.h" -#include "libavutil/common.h" -#include "ffmpeg_files/intreadwrite.h" #include "mpbswap.h" #include "ad_internal.h" diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index cd59b05e79..f407302d77 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -24,6 +24,7 @@ #include <libavutil/common.h> #include <libavutil/opt.h> +#include <libavutil/intreadwrite.h> #include "talloc.h" #include "config.h" @@ -31,7 +32,6 @@ #include "options.h" #include "av_opts.h" -#include "ffmpeg_files/intreadwrite.h" #include "mpbswap.h" #include "fmt-conversion.h" diff --git a/libmpcodecs/vd_mtga.c b/libmpcodecs/vd_mtga.c index 390166a3e6..861f898f80 100644 --- a/libmpcodecs/vd_mtga.c +++ b/libmpcodecs/vd_mtga.c @@ -26,10 +26,11 @@ #include <stdlib.h> #include <string.h> +#include <libavutil/intreadwrite.h> + #include "config.h" #include "mp_msg.h" -#include "ffmpeg_files/intreadwrite.h" #include "libvo/fastmemcpy.h" #include "vd_internal.h" diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index 8fc843855f..08637b1407 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -19,6 +19,8 @@ #include <stdio.h> #include <stdlib.h> +#include <libavutil/intreadwrite.h> + #include "config.h" #ifdef HAVE_LIBDL @@ -26,7 +28,6 @@ #endif #include "mp_msg.h" -#include "ffmpeg_files/intreadwrite.h" #include "path.h" #include "vd_internal.h" diff --git a/libmpcodecs/vd_sgi.c b/libmpcodecs/vd_sgi.c index e7dd90cecc..1ec9b2e868 100644 --- a/libmpcodecs/vd_sgi.c +++ b/libmpcodecs/vd_sgi.c @@ -21,9 +21,10 @@ #include <stdio.h> #include <stdlib.h> +#include <libavutil/intreadwrite.h> + #include "config.h" #include "mp_msg.h" -#include "ffmpeg_files/intreadwrite.h" #include "mpbswap.h" #include "vd_internal.h" diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c index 5ad3b35691..ba3c0d5d86 100644 --- a/libmpcodecs/vd_theora.c +++ b/libmpcodecs/vd_theora.c @@ -21,12 +21,13 @@ #include <stdarg.h> #include <assert.h> +#include <libavutil/intreadwrite.h> + #include "config.h" #include "mp_msg.h" #include "vd_internal.h" -#include "ffmpeg_files/intreadwrite.h" static const vd_info_t info = { "Theora/VP3", |