diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libmpcodecs/ad_qtaudio.c | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
| download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libmpcodecs/ad_qtaudio.c')
| -rw-r--r-- | libmpcodecs/ad_qtaudio.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index cfc5dd26f8..2fa71c6548 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -4,20 +4,15 @@ #include <inttypes.h> #include "config.h" - -#ifdef CONFIG_QUICKTIME -#include <QuickTime/QuickTimeComponents.h> -#endif - #include "mp_msg.h" - -#include "loader/wine/windef.h" - -#include "ad_internal.h" #include "mpbswap.h" +#include "ad_internal.h" -#ifdef WIN32_LOADER +#ifdef CONFIG_QUICKTIME +#include <QuickTime/QuickTimeComponents.h> +#else #include "loader/ldt_keeper.h" +#include "loader/wine/windef.h" #endif static const ad_info_t info = { |