--- /usr/portage/media-video/mplayer/mplayer-1.0.20070622-r1.ebuild	2007-06-29 08:06:25.000000000 +1200
+++ /usr/local/portage/media-video/mplayer/mplayer-1.0.20070622-r1.ebuild	2007-07-05 00:24:12.000000000 +1200
@@ -12,7 +12,7 @@
 unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
 speex srt sse sse2 ssse3 svga tga theora tivo truetype v4l v4l2 vidix win32codecs X x264 xanim xinerama xv xvid xvmc zoran"
 
-VIDEO_CARDS="s3virge mga tdfx vesa"
+VIDEO_CARDS="i810 s3virge mga nvidia tdfx vesa"
 
 for X in ${VIDEO_CARDS}; do
 	IUSE="${IUSE} video_cards_${X}"
@@ -340,7 +340,19 @@
 
 	if use xv; then
 		if use xvmc; then
-			myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
+			if [[ -z ${VIDEO_CARDS} ]] ; then
+				# Should probably warn default is built.
+				myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
+			else
+				# if both nvidia and i810 is specified maybe a warning is good.
+				if use video_cards_nvidia; then
+					myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCNVIDIA"
+				elif use video_cards_i810; then
+					myconf="${myconf} --enable-xvmc --with-xvmclib=I810XvMC"
+				else
+					myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
+				fi
+			fi
 		else
 			myconf="${myconf} --disable-xvmc"
 		fi