Merge svn changes up to r30236
commit819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 8 Jan 2010 00:44:37 +0000 (8 02:44 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 8 Jan 2010 00:44:37 +0000 (8 02:44 +0200)
treef6d6d1e944e5b44ac1d26adcecc4379cd9dc4806
parent3488fcafe6709337b25a742999a03d04d561f419
parent3f1a03feb15344188a8213854246d42db38314ac
Merge svn changes up to r30236
configure
libmpcodecs/vd_ffmpeg.c
libvo/video_out.c
osdep/mplayer.rc
stream/stream_ffmpeg.c