Public Git Hosting - mplayer/glamo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 525fe89 f4a1d6e)

commit	80b1bf01c8bf395c320277a1b1064a287d25f15f
author	Martin Jansa <Martin.Jansa@gmail.com>
	Thu, 11 Mar 2010 07:02:19 +0000 (11 08:02 +0100)
committer	Martin Jansa <Martin.Jansa@gmail.com>
	Thu, 11 Mar 2010 07:02:19 +0000 (11 08:02 +0100)
tree	089026471be4aaef5c452e3a77bd90281a75e789	tree \| snapshot (tar.gz zip)
parent	525fe892c7b164b5b26b9485f1cee090dbddb629	commit \| diff
parent	f4a1d6e36eb2e9a92894ea42276f9e1087c4bd57	commit \| diff

Merge remote branch 'mplayer/master'

Conflicts:
Makefile

Makefile	diff1 \|	diff2 \|	blob \| history
codec-cfg.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
etc/codecs.conf	diff1 \|	diff2 \|	blob \| history
libmpcodecs/img_format.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/img_format.h	diff1 \|	diff2 \|	blob \| history
libmpcodecs/mp_image.h	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_expand.c	diff1 \|	diff2 \|	blob \| history
libvo/video_out.c	diff1 \|	diff2 \|	blob \| history

mplayer with SMedia Glamo drivers