diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-22 03:04:08 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-26 06:16:43 +0300 |
| commit | d6c410b54cbccabda7b36a929bff37e8510a4cc5 (patch) | |
| tree | 7e17a920986879ec168d0882aea379f79a802cc6 /libmpdemux | |
| parent | a810867d04e80c57b2f5e5a60a1af37bb5a6dfd6 (diff) | |
| download | mpv-d6c410b54cbccabda7b36a929bff37e8510a4cc5.tar.bz2 mpv-d6c410b54cbccabda7b36a929bff37e8510a4cc5.tar.xz | |
Replace libavutil internal header #includes with MPlayer copies
Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h
and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/
instead.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/asfheader.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_asf.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_audio.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_mkv.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_mov.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_ogg.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_ty.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_vqf.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 7cf0111e67..905ec83949 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -24,7 +24,7 @@ #include "config.h" #include "libavutil/common.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include "mp_msg.h" #include "help_mp.h" diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index e000376b40..0290034b7a 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -33,7 +33,7 @@ #include "demuxer.h" #include "libvo/fastmemcpy.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" // defined at asfheader.c: diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index d9ea6f2f84..aa950046c6 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -27,7 +27,7 @@ #include "stheader.h" #include "genres.h" #include "mp3_hdr.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include <string.h> diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 3972c1bd6f..5c05dbf585 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -58,7 +58,7 @@ #endif #include "libavutil/lzo.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include "libavutil/avstring.h" static const unsigned char sipr_swaps[38][2]={ diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index c38fa7ee16..10da40c5bb 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -63,7 +63,7 @@ #include "libmpcodecs/img_format.h" #include "libavutil/common.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include "libvo/sub.h" diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index af730bb712..4816c789ec 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -31,7 +31,7 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's') #define FOURCC_SPEEX mmioFOURCC('s', 'p', 'x', ' ') diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 77dfbe7fd5..2cb38b4370 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -45,7 +45,7 @@ #include "stheader.h" #include "sub_cc.h" #include "libavutil/avstring.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" void skip_audio_frame( sh_audio_t *sh_audio ); extern int sub_justify; diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c index 4ec8865a10..9a90f33fb3 100644 --- a/libmpdemux/demux_vqf.c +++ b/libmpdemux/demux_vqf.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <stdio.h> #include "libavutil/common.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include "mpbswap.h" #include "stream/stream.h" |