Update sources
commit5b76d6ef2557d4a1f94e75867b5e738bc807b973
authorKovenksy <diogomfranco@gmail.com>
Mon, 23 Nov 2009 00:35:24 +0000 (22 21:35 -0300)
committerKovenksy <diogomfranco@gmail.com>
Mon, 23 Nov 2009 00:35:24 +0000 (22 21:35 -0300)
tree2563a29b17135a91e9360e6596d66de169de4f5e
parent483d966c519b0bf30e0e8c5039c515d134589aba
parent5995bc175aea0417ce7ff7285c1c8fc84ebb5704
Update sources

Conflicts:
libvo/w32_common.c
DOCS/man/en/mplayer.1
Makefile
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_lavf.c
libvo/w32_common.c
mplayer.c
options.h