diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 04:34:58 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 05:03:57 +0300 |
| commit | 06a35804f37754e2d6ec5bdebe9d83fcddb1caf6 (patch) | |
| tree | eb14069a6843691395ed20773c8768e91a5c1153 /libmpcodecs | |
| parent | e1ef11f0f62cac4a848a4cc9bba2f06dee8fd362 (diff) | |
| parent | 7398abf3899f953eda95d925df6bcc64b08461ed (diff) | |
| download | mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.bz2 mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.xz | |
Merge svn changes up to r26587
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_qtaudio.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/native/nuppelvideo.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_qtvideo.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_xanim.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_scale.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index fff29094fb..4a9bf313e2 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -14,7 +14,7 @@ #include "loader/wine/windef.h" #include "ad_internal.h" -#include "bswap.h" +#include "mpbswap.h" #ifdef WIN32_LOADER #include "loader/ldt_keeper.h" diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c index 8f4426340b..ff3e1f83fa 100644 --- a/libmpcodecs/native/nuppelvideo.c +++ b/libmpcodecs/native/nuppelvideo.c @@ -15,7 +15,7 @@ #include "mp_msg.h" #include "mpbswap.h" -#include "../libvo/fastmemcpy.h" +#include "libvo/fastmemcpy.h" #include "libmpdemux/nuppelvideo.h" #include "rtjpegn.h" diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index c82b97338a..a690257875 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -28,7 +28,7 @@ static const vd_info_t info = { LIBVD_EXTERN(qtvideo) -#include "bswap.h" +#include "mpbswap.h" #ifndef HAVE_QUICKTIME #include "loader/qtx/qtxsdk/components.h" diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c index 07acf558be..5d1e4ec739 100644 --- a/libmpcodecs/vd_xanim.c +++ b/libmpcodecs/vd_xanim.c @@ -37,7 +37,7 @@ LIBVD_EXTERN(xanim) #include <errno.h> /* strerror, errno */ #include "mp_msg.h" -#include "bswap.h" +#include "mpbswap.h" #include "osdep/timer.h" diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index 9754370239..10c28ab79b 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -12,7 +12,7 @@ #include "mp_image.h" #include "vf.h" #include "fmt-conversion.h" -#include "bswap.h" +#include "mpbswap.h" #include "libswscale/swscale.h" #include "vf_scale.h" |