Merge svn changes up to r30907
commitff559b8e90c343eb465400d77fe8881eff09c6e3
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 13:57:25 +0000 (26 16:57 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 13:57:25 +0000 (26 16:57 +0300)
treef97a23e6945e91be5be86baf2cfc06e0d384e867
parentd2e25a90c40c47b97becaa6eaefa16e61f7f0cdf
parentb864ff1b8d73616e2e5bab1e00ef2bdb8fe50278
Merge svn changes up to r30907
12 files changed:
DOCS/man/en/mplayer.1
cfg-common-opts.h
configure
etc/codecs.conf
libmpcodecs/ad_realaud.c
libmpcodecs/vd_realvid.c
libmpcodecs/vd_xanim.c
libmpdemux/video.c
libvo/gl_common.c
loader/qtx/qtxsdk/components.h
mencoder.c
mplayer.c