Merge svn changes up to r29117
commitcf9edda1d370d39bc8a3d020a9c2bc4090d2457e
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 31 Mar 2009 23:26:34 +0000 (1 02:26 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 31 Mar 2009 23:43:47 +0000 (1 02:43 +0300)
tree1d1bbc529a4e8109fb6aa5cadf0dbbb7bd61013a
parent7af8417ae7beb409f54849956a7037bc66c4c334
parent1c37a6427abef0827c608d328d37ca1b1a0a022d
Merge svn changes up to r29117
49 files changed:
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
configure
defaultopts.c
input/input.c
libaf/af.h
libass/ass_render.c
libmpcodecs/ad.c
libmpcodecs/ad_ffmpeg.c
libmpcodecs/mp_image.h
libmpcodecs/vd_ffmpeg.c
libmpcodecs/vd_libmpeg2.c
libmpcodecs/vf.c
libmpcodecs/vf_bmovl.c
libmpcodecs/vf_filmdint.c
libmpcodecs/vf_framestep.c
libmpcodecs/vf_ilpack.c
libmpcodecs/vf_noise.c
libmpcodecs/vf_sab.c
libmpcodecs/vf_scale.c
libmpcodecs/vf_screenshot.c
libmpcodecs/vf_smartblur.c
libmpcodecs/vf_tile.c
libmpcodecs/vf_yadif.c
libmpdemux/demuxer.c
libvo/spuenc.c
libvo/spuenc.h
libvo/vo_aa.c
libvo/vo_gif89a.c
libvo/vo_gl.c
libvo/vo_jpeg.c
libvo/vo_kva.c
libvo/vo_md5sum.c
libvo/vo_png.c
libvo/vo_pnm.c
libvo/vo_sdl.c
libvo/vo_vdpau.c
libvo/vo_vesa.c
libvo/vo_x11.c
libvo/vo_xvmc.c
libvo/vo_zr2.c
libvo/w32_common.c
mencoder.c
mplayer.c
options.h
osdep/getch2-os2.c
stream/asf_streaming.c
stream/stream_dvd.c
stream/tv.c