--- xbmc-10.1.ebuild	2011-10-13 00:01:19.000000000 +0100
+++ xbmc-10.1-r1.ebuild	2012-01-20 15:01:23.592116881 +0000
@@ -65,12 +65,12 @@
 	media-libs/tiff
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
-	>=virtual/ffmpeg-0.6
+	=media-video/ffmpeg-0.7*
 	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
 	webserver? ( net-libs/libmicrohttpd )
 	net-misc/curl
-	|| ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 )
+	>=net-fs/samba-3.4.6[smbclient] 
 	sys-apps/dbus
 	sys-libs/zlib
 	virtual/mysql
@@ -79,7 +79,7 @@
 	vaapi? ( x11-libs/libva )
 	vdpau? (
 		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		virtual/ffmpeg[vdpau]
+		media-video/ffmpeg[vdpau]
 	)
 	x11-libs/libXinerama
 	xrandr? ( x11-libs/libXrandr )