Merge svn changes up to r30748
commite74708f6194ef0af2bdf37e857ed232027fa46ba
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 23:46:46 +0000 (10 01:46 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 23:50:55 +0000 (10 01:50 +0200)
treef7b53476abeb1cc8ccbe1c49113e9722c51b7800
parent2ad00b5319603b22f9b0858bb14d016f673157cb
parentcb8796857c8bd851e3b97d729af149e3f003b851
Merge svn changes up to r30748
31 files changed:
DOCS/man/en/mplayer.1
ass_mp.c
ass_mp.h
asxparser.c
help/help_mp-it.h
libmenu/menu_filesel.c
libmpcodecs/ad_libmad.c
libmpcodecs/mp_image.h
libmpcodecs/ve_vfw.c
libmpdemux/demux_ogg.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libmpdemux/ebml.c
libmpdemux/muxer_lavf.c
libmpdemux/muxer_mpeg.c
libmpdemux/video.c
libvo/sub.c
libvo/video_out.c
libvo/vo_fbdev2.c
loader/ldt_keeper.c
m_config.c
m_option.c
m_option.h
playtree.c
playtreeparser.c
stream/open.c
stream/stream.c
stream/stream.h
stream/stream_cddb.c
stream/tvi_dshow.c
subreader.c