Merge remote branch 'mplayer/master'
commit71807fcbb1eb35c337ef03f4f62d181963173550
authorMartin Jansa <Martin.Jansa@gmail.com>
Mon, 1 Feb 2010 06:59:38 +0000 (1 07:59 +0100)
committerMartin Jansa <Martin.Jansa@gmail.com>
Mon, 1 Feb 2010 06:59:38 +0000 (1 07:59 +0100)
tree5a4210842983c9dc17c08f3f1b105b1f4d7e78a6
parent18ae04330acaa9212b422e71eee239eacd475805
parent9118a5dd02c365e51a9f49dd34469dd7c26b89c7
Merge remote branch 'mplayer/master'
Makefile
configure
etc/codecs.conf
libmpcodecs/img_format.h
libmpcodecs/vd.c
libvo/video_out.c