Merge svn changes up to r27841
commit479f5e742f22d46430fa265adfa9162f4e2ab865
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 28 Oct 2008 02:12:18 +0000 (28 04:12 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 28 Oct 2008 02:12:18 +0000 (28 04:12 +0200)
tree8450cfd34feb5b81d604101ad9ebfc7b24c1d88e
parent0d7f9f033cdd677df3b85aca45491955b87a1abc
parent97293969b40797442ec0f612b89a89ace8804561
Merge svn changes up to r27841

Conflicts:
mplayer.c
command.c
configure
libmpcodecs/vf_smartblur.c
libmpdemux/demux_mkv.c
libmpdemux/stheader.h
mencoder.c
mplayer.c
spudec.c
spudec.h