Merge svn changes up to r28951
commitae2faad6669c313b7a5dd318baeee0bffdd47031
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 14 Mar 2009 21:52:45 +0000 (14 23:52 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 14 Mar 2009 21:52:45 +0000 (14 23:52 +0200)
tree0b383b5dde56d54be4b144e7e23e96bd8bdd43cf
parentb93f4b7bba0e31d157b74685d3166f74a6c244d7
parent642162c07460e439d1d81cda4643dc028ed238e0
Merge svn changes up to r28951
38 files changed:
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
Makefile
configure
defaultopts.c
input/input.c
libao2/ao_sdl.c
libass/ass_cache.c
libass/ass_render.c
libmpcodecs/vd.c
libmpcodecs/ve_nuv.c
libmpcodecs/vf_decimate.c
libmpcodecs/vf_divtc.c
libmpdemux/demux_mov.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/font_load_ft.c
libvo/video_out.c
libvo/vo_aa.c
libvo/vo_directfb2.c
libvo/vo_gif89a.c
libvo/vo_gl.c
libvo/vo_gl2.c
libvo/vo_ivtv.c
libvo/vo_jpeg.c
libvo/vo_kva.c
libvo/vo_macosx.m
libvo/vo_md5sum.c
libvo/vo_png.c
libvo/vo_pnm.c
libvo/vo_sdl.c
libvo/vo_v4l2.c
libvo/vo_vdpau.c
libvo/vo_xv.c
libvo/vo_xvmc.c
libvo/vo_yuv4mpeg.c
libvo/vo_zr2.c
options.h