Merge svn changes up to r31189
commite74361c48822accc0413cae6911efaf6bc7a2b5f
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 30 May 2010 12:42:42 +0000 (30 15:42 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 30 May 2010 12:51:33 +0000 (30 15:51 +0300)
treea851bbae7f1aac9a46f57877baa2ef72cf82487b
parent1ffe8bece5922b344d750394a0fdd4e6e5794c82
parent0dd2ddd2bc71bb180811eae73ecc15c526520144
Merge svn changes up to r31189
libao2/ao_pcm.c
libmpcodecs/vf_geq.c
libmpcodecs/vf_qp.c
libvo/w32_common.c
libvo/x11_common.c