Public Git Hosting - mplayer/glamo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 52126e5 92cd6dc)

commit	231b33a02fae95b260120349040106bfa34a3750
author	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Thu, 7 Jan 2010 23:05:30 +0000 (8 01:05 +0200)
committer	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Thu, 7 Jan 2010 23:05:30 +0000 (8 01:05 +0200)
tree	23c4de0e6263b2d99966348d7003177b3b3e3740	tree \| snapshot (tar.gz zip)
parent	52126e574c7872ca95e7974cfe5445421b74f24c	commit \| diff
parent	92cd6dc3e916ae4275ff05d2b238fc778cfbfc6b	commit \| diff

Merge svn changes up to r30165

23 files changed:

DOCS/man/fr/mplayer.1	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
codec-cfg.c	diff1 \|	diff2 \|	blob \| history
libao2/ao_alsa.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/img_format.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/mp_image.h	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_ffmpeg.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_scale.c	diff1 \|	diff2 \|	blob \| history
libvo/gl_common.c	diff1 \|	diff2 \|	blob \| history
libvo/gl_common.h	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl2.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_ivtv.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_jpeg.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_png.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_pnm.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_v4l2.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xv.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xvmc.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_zr2.c	diff1 \|	diff2 \|	blob \| history
m_option.c	diff1 \|	diff2 \|	blob \| history
subopt-helper.c	diff1 \|	diff2 \|	blob \| history

mplayer with SMedia Glamo drivers