Merge svn changes up to r30876
commit0269d22d32fb380e7128ca0c60f6f1638c6dab70
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 10 Mar 2010 01:18:42 +0000 (10 03:18 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 10 Mar 2010 01:18:42 +0000 (10 03:18 +0200)
tree53ba64153d9ef930f73458138478a6d0def381ce
parent240550bbb94653907faa6e0bb1c5ac3d279cc252
parent97ef28ad9aa2f34aea0779062976ad4294c0af51
Merge svn changes up to r30876
16 files changed:
DOCS/man/en/mplayer.1
DOCS/xml/en/faq.xml
Makefile
configure
etc/codecs.conf
libmpcodecs/ve_qtvideo.c
libmpcodecs/vf.c
libmpdemux/mp_taglists.c
libvo/vo_fbdev.c
loader/qtx/qtxsdk/components.h
mencoder.c
mplayer.c
stream/stream.h
stream/stream_cddb.c
stream/stream_file.c
stream/stream_live555.c