Merge svn changes up to r29277
commit1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 8 May 2009 20:50:26 +0000 (8 23:50 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 8 May 2009 20:50:26 +0000 (8 23:50 +0300)
treec5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c
parentf2864e9a072f53c38a04dd7c44392521777dc908
parent86c9fb2e8930de031807513c9b93d47394d2d2fa
Merge svn changes up to r29277
33 files changed:
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
Makefile
codec-cfg.c
common.mak
configure
help/help_mp-en.h
input/ar.c
libao2/ao_sdl.c
libao2/audio_out.c
libass/ass_render.c
libmpcodecs/ad_ffmpeg.c
libmpcodecs/ad_qtaudio.c
libmpcodecs/dec_video.c
libmpcodecs/vf_divtc.c
libmpcodecs/vf_sab.c
libmpcodecs/vf_zrmjpeg.c
libvo/gl_common.c
libvo/mga_common.c
libvo/video_out.c
libvo/vo_caca.c
libvo/vo_corevideo.m
libvo/vo_directx.c
libvo/vo_dxr2.c
libvo/vo_quartz.c
libvo/vo_tdfxfb.c
libvo/vo_vdpau.c
mencoder.c
mplayer.c
osdep/timer-darwin.c
osdep/timer-linux.c
subdir.mak
subreader.c