diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:44:28 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:44:28 +0200 |
| commit | bc0f5249090cec1c460a910c2f46d2c760a2a3fe (patch) | |
| tree | 91ea711bd517d7ebd21f96dc1e9e64da3e7953ac /libao2 | |
| parent | a1b84c208002a293e663673af26ccaf639ae726f (diff) | |
| parent | bc802c1e3efbe92cf653c415db5143291f096af4 (diff) | |
| download | mpv-bc0f5249090cec1c460a910c2f46d2c760a2a3fe.tar.bz2 mpv-bc0f5249090cec1c460a910c2f46d2c760a2a3fe.tar.xz | |
Merge svn changes up to r30502
Conflicts:
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
libswscale/swscale.c
libvo/x11_common.c
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_kai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libao2/ao_kai.c b/libao2/ao_kai.c index a52b60e0b5..cc0a3373a7 100644 --- a/libao2/ao_kai.c +++ b/libao2/ao_kai.c @@ -242,7 +242,7 @@ static int init(int rate, int channels, int format, int flags) ao_data.outburst = nBytesPerSample * OUTBURST_SAMPLES; ao_data.buffersize = m_kaiSpec.ulBufferSize; - m_nBufSize = (m_kaiSpec.ulBufferSize * m_kaiSpec.ulNumBuffers) << 3; + m_nBufSize = (m_kaiSpec.ulBufferSize * m_kaiSpec.ulNumBuffers) << 2; // multiple of CHUNK_SIZE m_nBufSize = (m_nBufSize / CHUNK_SIZE) * CHUNK_SIZE; |