Public Git Hosting - mplayer.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 5c4b059 d037672)

commit	7e65428712beacd416dc3410c52f22ebfd3b4c53
author	Uoti Urpala <uau@mplayer2.org>
	Sun, 1 May 2011 21:46:03 +0000 (2 00:46 +0300)
committer	Uoti Urpala <uau@mplayer2.org>
	Sun, 1 May 2011 21:46:03 +0000 (2 00:46 +0300)
tree	79bb2f4388be7031b5505c7745e1a59aff6cff56	tree \| snapshot (tar.gz zip)
parent	5c4b059f1608f6d6a981b7d81a14f1c46e40ba52	commit \| diff
parent	d0376729d171a6c0b4cc15928c168f68adefbaa6	commit \| diff

Merge branch 'mplayer1_changes'

13 files changed:

DOCS/man/en/mplayer.1	diff1 \|	diff2 \|	blob \| history
cfg-mplayer.h	diff1 \|	diff2 \|	blob \| history
command.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_ffmpeg.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_ts.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demuxer.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_fbdev.c	diff1 \|	diff2 \|	blob \| history
mplayer.c	diff1 \|	diff2 \|	blob \| history
options.h	diff1 \|	diff2 \|	blob \| history
stream/stream.c	diff1 \|	diff2 \|	blob \| history
stream/stream_dvdnav.c	diff1 \|	diff2 \|	blob \| history
stream/stream_smb.c	diff1 \|	diff2 \|	blob \| history

MPlayer development branch