Merge svn changes up to r28341
commit79e1aa7cc7a9ac695c3af361bca72013ef272885
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 18 Jan 2009 22:04:43 +0000 (19 00:04 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 18 Jan 2009 22:04:43 +0000 (19 00:04 +0200)
treecc52764dfa4fab2cfc74c6aee5d71b27edbf014b
parent3ba97da297e1e1a5ca9dabdda60cc6a62f77affc
parent39cb032fd184a62416f1e62d26e05576cfd8dbe4
Merge svn changes up to r28341

Conflicts:
configure
libmpcodecs/native/rtjpegn.c
28 files changed:
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
configure
libaf/af.h
libmpcodecs/dec_video.c
libmpcodecs/native/rtjpegn.c
libmpcodecs/vd_libmpeg2.c
libmpcodecs/vf_decimate.c
libmpcodecs/vf_divtc.c
libmpcodecs/vf_eq.c
libmpcodecs/vf_filmdint.c
libmpcodecs/vf_fspp.c
libmpcodecs/vf_halfpack.c
libmpcodecs/vf_hue.c
libmpcodecs/vf_ilpack.c
libmpcodecs/vf_ivtc.c
libmpcodecs/vf_noise.c
libmpcodecs/vf_pp7.c
libmpcodecs/vf_scale.c
libmpcodecs/vf_spp.c
libmpcodecs/vf_tfields.c
libmpcodecs/vf_unsharp.c
libmpcodecs/vf_uspp.c
libmpcodecs/vf_yadif.c
libmpdemux/demux_lavf.c
libvo/vo_macosx.m
mencoder.c
mplayer.c