summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:42:42 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:51:33 +0300
commite74361c48822accc0413cae6911efaf6bc7a2b5f (patch)
treea851bbae7f1aac9a46f57877baa2ef72cf82487b /libao2
parent1ffe8bece5922b344d750394a0fdd4e6e5794c82 (diff)
parent0dd2ddd2bc71bb180811eae73ecc15c526520144 (diff)
downloadmpv-e74361c48822accc0413cae6911efaf6bc7a2b5f.tar.bz2
mpv-e74361c48822accc0413cae6911efaf6bc7a2b5f.tar.xz
Merge svn changes up to r31189
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_pcm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c
index 3639647284..0c86977b62 100644
--- a/libao2/ao_pcm.c
+++ b/libao2/ao_pcm.c
@@ -209,9 +209,11 @@ static void uninit(int immed){
#endif
if (broken_seek || fseek(fp, 0, SEEK_SET) != 0)
mp_msg(MSGT_AO, MSGL_ERR, "Could not seek to start, WAV size headers not updated!\n");
- else if (data_length > 0x7ffff000)
- mp_msg(MSGT_AO, MSGL_ERR, "File larger than allowed for WAV files, may play truncated!\n");
else {
+ if (data_length > 0xfffff000) {
+ mp_msg(MSGT_AO, MSGL_ERR, "File larger than allowed for WAV files, may play truncated!\n");
+ data_length = 0xfffff000;
+ }
write_wave_header(fp, data_length);
}
}