Merge svn changes up to r30917
commit95fba94860a02be5b50c4050f9ba2ac41daea3c2
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 14:11:04 +0000 (26 17:11 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 14:11:04 +0000 (26 17:11 +0300)
tree79ebb3fb8b351e8347c092e62331cd50b2a06a7b
parent3c2d6d9a8e28900300d20830c309eea2d511cfc8
parent0426d5d72df81217f32147d039f3eb29c009af12
Merge svn changes up to r30917
configure
etc/codecs.conf
mencoder.c
mpcommon.c
mpcommon.h
mplayer.c