Merge svn changes up to r28065
commite62517ef6a8d23cd78325a9661f8865bd222e004
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 2 Dec 2008 16:02:05 +0000 (2 18:02 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 2 Dec 2008 16:02:05 +0000 (2 18:02 +0200)
tree76b7a0af867236c2989ceca1cffcae541ceda9c5
parent62dda60800a902fdaf9b0ec63d8488aaa48c485f
parent27b167bb75b908541563bab964e97b06d621f837
Merge svn changes up to r28065
DOCS/man/en/mplayer.1
Makefile
configure
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_macosx.m
libvo/vo_sdl.c
stream/cache2.c