Merge svn changes up to r30643
commitc37f09693d0edb632c80f8f38ecdb2faf3547f7f
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 22:00:06 +0000 (10 00:00 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 22:00:06 +0000 (10 00:00 +0200)
tree44df07eacb522a97bbecd7a3a0f93e8d6a933003
parent22a06c4ae5672c1dd629918d0a279b8af24e35c3
parent2aafb808284d74edab6e5320e1114f5c74d5881e
Merge svn changes up to r30643
36 files changed:
DOCS/man/en/mplayer.1
asxparser.c
cfg-mencoder.h
cfg-mplayer.h
etc/codecs.conf
libao2/ao_sdl.c
libmenu/menu.c
libmpcodecs/ad_acm.c
libmpcodecs/ad_faad.c
libmpcodecs/ad_qtaudio.c
libmpcodecs/dec_teletext.c
libmpcodecs/vd_ffmpeg.c
libmpcodecs/vd_vfw.c
libmpcodecs/ve_vfw.c
libmpcodecs/vf_expand.c
libmpdemux/asfheader.c
libmpdemux/aviheader.c
libmpdemux/aviprint.c
libmpdemux/demux_asf.c
libmpdemux/demux_audio.c
libmpdemux/demux_avi.c
libmpdemux/demux_lavf.c
libmpdemux/demux_mkv.c
libmpdemux/demux_mov.c
libmpdemux/demux_mpg.c
libmpdemux/demux_ogg.c
libmpdemux/demux_real.c
libmpdemux/demux_ty.c
libmpdemux/demux_ty_osd.c
libmpdemux/demuxer.h
libmpdemux/mp3_hdr.c
libmpdemux/muxer_mpeg.c
libmpdemux/parse_mp4.c
libmpdemux/video.c
libvo/vo_zr.c
mencoder.c