Merge svn changes up to r30848
commit240550bbb94653907faa6e0bb1c5ac3d279cc252
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 10 Mar 2010 01:00:14 +0000 (10 03:00 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 10 Mar 2010 01:00:14 +0000 (10 03:00 +0200)
tree1cd5346e52515dbeff187d040d79b92fae96caa9
parent9895f2360fd5e8c48f21117d6934254317891cde
parentfbb74e16a38d6a5af31a7fb369195988f7414766
Merge svn changes up to r30848
DOCS/man/en/mplayer.1
configure
libao2/ao_mpegpes.c
libmpcodecs/vd_dmo.c
libmpcodecs/vd_dshow.c
libvo/vo_fbdev.c
libvo/vo_mpegpes.c
osdep/priority.c
stream/stream_file.c
stream/stream_vcd.c