Merge svn changes up to r28366
commitdd888b05ff3af1c6c35582e75bedae687d38fc66
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 25 Jan 2009 22:58:15 +0000 (26 00:58 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 25 Jan 2009 22:58:15 +0000 (26 00:58 +0200)
tree7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9
parent0406d951209df261970424256d76f293649ec140
parent85b28eb411cfa304f1714219ebd17b10a0977fa3
Merge svn changes up to r28366

Contains more changes needed to sync build system with latest FFmpeg.

Conflicts:
Makefile
configure
mplayer.c
Makefile
configure
libmpcodecs/vf_fspp.c
libmpcodecs/vf_mcdeint.c
libmpcodecs/vf_pp.c
libmpcodecs/vf_spp.c
mencoder.c
mpcommon.c
mplayer.c
playtree.c
playtreeparser.c