diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libmpcodecs/ad_qtaudio.c | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
| download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz | |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'libmpcodecs/ad_qtaudio.c')
| -rw-r--r-- | libmpcodecs/ad_qtaudio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index 4a9bf313e2..cfc5dd26f8 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -5,7 +5,7 @@ #include "config.h" -#ifdef HAVE_QUICKTIME +#ifdef CONFIG_QUICKTIME #include <QuickTime/QuickTimeComponents.h> #endif @@ -30,7 +30,7 @@ static const ad_info_t info = { LIBAD_EXTERN(qtaudio) -#ifndef HAVE_QUICKTIME +#ifndef CONFIG_QUICKTIME typedef struct OpaqueSoundConverter* SoundConverter; typedef unsigned long OSType; typedef unsigned long UnsignedFixed; @@ -164,7 +164,7 @@ static int loader_init() mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n"); return 0; } -#endif /* #ifndef HAVE_QUICKTIME */ +#endif /* #ifndef CONFIG_QUICKTIME */ static SoundConverter myConverter = NULL; static SoundComponentData InputFormatInfo,OutputFormatInfo; @@ -180,7 +180,7 @@ static int preinit(sh_audio_t *sh){ unsigned long WantedBufferSize=0; //the size you want your buffers to be -#ifdef HAVE_QUICKTIME +#ifdef CONFIG_QUICKTIME EnterMovies(); #else if(loader_init()) return 0; // failed to load DLL @@ -280,7 +280,7 @@ static void uninit(sh_audio_t *sh){ // FreeLibrary( qtime_qts ); // qtime_qts = NULL; // printf("qt dll loader uninit done\n"); -#ifdef HAVE_QUICKTIME +#ifdef CONFIG_QUICKTIME ExitMovies(); #endif } |