Merge remote branch 'upstream/master'

author Lars Op den Kamp <lars@opdenkamp.eu>

Sun, 23 Jan 2011 02:26:52 +0000 (03:26 +0100)

committer Lars Op den Kamp <lars@opdenkamp.eu>

Sun, 23 Jan 2011 02:26:52 +0000 (03:26 +0100)
author Lars Op den Kamp <lars@opdenkamp.eu>
Sun, 23 Jan 2011 02:26:52 +0000 (03:26 +0100)
committer Lars Op den Kamp <lars@opdenkamp.eu>
Sun, 23 Jan 2011 02:26:52 +0000 (03:26 +0100)
diff --cc xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
Simple merge
diff --cc xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
Simple merge
author	Lars Op den Kamp <lars@opdenkamp.eu>
	Sun, 23 Jan 2011 02:26:52 +0000 (03:26 +0100)
committer	Lars Op den Kamp <lars@opdenkamp.eu>
	Sun, 23 Jan 2011 02:26:52 +0000 (03:26 +0100)
		1	2
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	patch \|	diff1 \|	diff2 \|	blob \| history