Merge svn changes r31318 to r31328
commitdde8b753e417bb44e5f18ac9d6901deb95bf6ab0
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 5 Jun 2010 20:34:17 +0000 (5 23:34 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 5 Jun 2010 20:35:42 +0000 (5 23:35 +0300)
tree84fc2a73fc1f514417cacd61c9a57580ca47cd66
parent331167ae132d35c821510307d8dd109ce27bfc1b
parent09bca6575f66394e1f4ba3845330d21d30895f3d
Merge svn changes r31318 to r31328

r31328 is a somewhat questionable (changing the option at that point
isn't quite safe), but it was a failure case already...
DOCS/man/en/mplayer.1
libmpcodecs/vf_geq.c
libmpcodecs/vf_qp.c
libmpdemux/demux_lavf.c
libmpdemux/demux_ts.c
libvo/vo_yuv4mpeg.c
mplayer.c