Merge svn changes up to r30475
commit12d3caebc7a44c67e7cc5a55e5ddadac844a225a
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 17:18:43 +0000 (9 19:18 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 17:18:43 +0000 (9 19:18 +0200)
treee1d4d50d1960d8f7015dc7f139443550eccff51d
parent323890871d9a4d5bed8a38b1b676590ce614d87a
parentb1ca7b2a66a2f53312cd831de42b80aa430c6898
Merge svn changes up to r30475
77 files changed:
DOCS/man/en/mplayer.1
asxparser.c
asxparser.h
cfg-common-opts.h
cfg-common.h
cfg-mencoder.h
cfg-mplayer.h
codec-cfg.c
codec-cfg.h
command.c
command.h
cpudetect.h
edl.c
find_sub.c
m_config.c
m_config.h
m_option.c
m_option.h
m_property.c
mencoder.c
mixer.c
mp_core.h
mp_fifo.c
mp_fifo.h
mp_msg.c
mp_msg.h
mp_osd.h
mpbswap.h
mpcommon.c
mpcommon.h
mplayer.c
mplayer.h
parser-mecmd.c
parser-mpcmd.c
playtree.c
playtree.h
playtreeparser.c
playtreeparser.h
spudec.c
spudec.h
stream/ai_alsa.c
stream/ai_alsa1x.c
stream/ai_oss.c
stream/asf_streaming.c
stream/audio_in.c
stream/cache2.c
stream/cdinfo.c
stream/network.c
stream/network.h
stream/open.c
stream/stream.c
stream/stream.h
stream/stream_cdda.c
stream/stream_cddb.c
stream/stream_cue.c
stream/stream_dvd.c
stream/stream_dvd_common.c
stream/stream_dvdnav.c
stream/stream_ffmpeg.c
stream/stream_file.c
stream/stream_live555.c
stream/stream_radio.h
stream/stream_smb.c
stream/stream_vcd.c
stream/tcp.c
stream/tv.c
stream/tvi_bsdbt848.c
stream/tvi_v4l.c
stream/url.c
stream/vcd_read.h
stream/vcd_read_fbsd.h
sub_cc.c
sub_cc.h
subopt-helper.c
subreader.c
subreader.h
vobsub.h