summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authoradrian <adrian@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-07-11 21:02:53 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:14:44 +0200
commit2050baef96dda9419d9a428a3e124a427c45ea17 (patch)
tree3d31ce2f5986d6a9548e43ecaddc18a1e2b5e957 /libao2
parent6d19d345063bd7537a3ca3d1b85706b1a711b84b (diff)
downloadmpv-2050baef96dda9419d9a428a3e124a427c45ea17.tar.bz2
mpv-2050baef96dda9419d9a428a3e124a427c45ea17.tar.xz
ao_coreaudio: use same types as coreaudio API
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31714 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_coreaudio.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libao2/ao_coreaudio.c b/libao2/ao_coreaudio.c
index cd0d0886fe..beec775d05 100644
--- a/libao2/ao_coreaudio.c
+++ b/libao2/ao_coreaudio.c
@@ -352,10 +352,9 @@ ComponentDescription desc;
Component comp;
AURenderCallbackStruct renderCallback;
OSStatus err;
-UInt32 size, maxFrames, i_param_size;
+UInt32 size, maxFrames, i_param_size, b_alive;
char *psz_name;
AudioDeviceID devid_def = 0;
-int b_alive;
ao_msg(MSGT_AO,MSGL_V, "init([%dHz][%dch][%s][%d])\n", rate, channels, af_fmt2str_short(format), flags);
@@ -1043,7 +1042,7 @@ static void uninit(int immed)
if (ao->b_changed_mixing && ao->sfmt_revert.mFormatID != kAudioFormat60958AC3)
{
- int b_mix;
+ UInt32 b_mix;
Boolean b_writeable;
/* Revert mixable to true if we are allowed to. */
err = IsAudioPropertySettable(ao->i_selected_dev,