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 /stream/stream_dvd_common.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 'stream/stream_dvd_common.c')
| -rw-r--r-- | stream/stream_dvd_common.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c index b2f3a14fee..db566e5136 100644 --- a/stream/stream_dvd_common.c +++ b/stream/stream_dvd_common.c @@ -16,13 +16,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include <fcntl.h> #include <inttypes.h> #include <unistd.h> #include <stdio.h> #include <string.h> +#include <libavutil/intreadwrite.h> + +#include "config.h" + #include <dvdread/ifo_types.h> + #ifdef __FreeBSD__ #include <sys/cdrio.h> #endif @@ -37,7 +41,6 @@ #include "mp_msg.h" #include "stream_dvd_common.h" -#include "ffmpeg_files/intreadwrite.h" const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; const char * const dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" }; |