Merge svn changes up to r30605
commit89c5ed5e9a720b032af9a58263deda158e1cbf4d
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 21:44:57 +0000 (9 23:44 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 21:44:57 +0000 (9 23:44 +0200)
tree2afd33bf8cd2692201b78a0a2da80824780efc63
parent0670a5d0905db1e4bbf376cf005ca836f4d0e04b
parentcdd0ab0da9818aeb527e35fe73ee57bdf3aa4f70
Merge svn changes up to r30605
etc/codecs.conf
libmpdemux/mp_taglists.c
libvo/vo_dxr3.c