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 /libmpcodecs | |
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 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_msadpcm.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ae_lavc.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ve_nuv.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_gradfun.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/ad_msadpcm.c b/libmpcodecs/ad_msadpcm.c index 57beb9a84c..c6e6c4fc55 100644 --- a/libmpcodecs/ad_msadpcm.c +++ b/libmpcodecs/ad_msadpcm.c @@ -13,7 +13,7 @@ #include "config.h" #include "libavutil/common.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include "mpbswap.h" #include "ad_internal.h" diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index 6806287e57..139d26636f 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -16,7 +16,7 @@ #include "libaf/af_format.h" #include "libaf/reorder_ch.h" #include "libavcodec/avcodec.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" static AVCodec *lavc_acodec; static AVCodecContext *lavc_actx; diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 4cf20037e9..0f9f9f7400 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -10,7 +10,7 @@ #include "av_opts.h" #include "libavutil/common.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include "mpbswap.h" #include "fmt-conversion.h" diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c index 67cc8b532d..b9d9b860ba 100644 --- a/libmpcodecs/ve_nuv.c +++ b/libmpcodecs/ve_nuv.c @@ -19,7 +19,7 @@ #include "mp_image.h" #include "vf.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include <lzo/lzo1x.h> #include "native/rtjpegn.h" diff --git a/libmpcodecs/vf_gradfun.c b/libmpcodecs/vf_gradfun.c index 26a859f459..83ae6fb9d6 100644 --- a/libmpcodecs/vf_gradfun.c +++ b/libmpcodecs/vf_gradfun.c @@ -39,7 +39,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" #include "libavutil/avutil.h" -#include "libavutil/x86_cpu.h" +#include "ffmpeg_files/x86_cpu.h" struct vf_priv_s { int thresh; |