Merge svn changes up to r28862
commite0172b96e3b6cc6a8b62ee5a52f780941a43de8b
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 6 Mar 2009 23:04:41 +0000 (7 01:04 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 6 Mar 2009 23:04:41 +0000 (7 01:04 +0200)
treef652f6d15740667d5434e526db3fd12a0573aa0f
parent0c6f667896620943ee6ae899d6e36c3da5c98c54
parent7e253f01715811e0c4f5f5b54317b098f2cd59d9
Merge svn changes up to r28862
33 files changed:
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
Makefile
cfg-mplayer.h
codec-cfg.c
configure
help/help_mp-en.h
libao2/ao_alsa.c
libao2/ao_ivtv.c
libao2/ao_mpegpes.c
libao2/ao_sdl.c
libao2/ao_v4l2.c
libao2/audio_out.c
libao2/audio_out.h
libass/ass_cache.c
libass/ass_cache.h
libass/ass_render.c
libmpcodecs/vd_ffmpeg.c
libvo/video_out.c
libvo/video_out.h
libvo/vo_gl.c
libvo/vo_vdpau.c
libvo/x11_common.c
m_option.c
m_option.h
osdep/getch2-win.c
osdep/getch2.c
osdep/getch2.h
osdep/mmap_anon.c
osdep/shmem.c
osdep/timer-linux.c
osdep/timer-win2.c
osdep/timer.h