--- /usr/portage/media-video/x264-encoder/x264-encoder-9999.ebuild	2011-05-28 16:04:21.000000000 +0400
+++ x264-encoder-9999.ebuild	2011-08-13 12:04:47.000000000 +0400
@@ -13,7 +13,7 @@
 inherit multilib toolchain-funcs ${V_ECLASS}
 
 if [ "${PV#9999}" = "${PV}" ] ; then
-	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245-stable"
 fi
 DESCRIPTION="A free commandline encoder for X264/AVC streams"
 HOMEPAGE="http://www.videolan.org/developers/x264.html"
@@ -21,7 +21,7 @@
 	EGIT_REPO_URI="git://git.videolan.org/x264.git"
 	SRC_URI=""
 else
-	SRC_URI="http://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
 fi
 
 LICENSE="GPL-2"
@@ -31,10 +31,13 @@
 else
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="debug ffmpeg mp4 +system-libx264 +threads"
+IUSE="debug ffmpeg ffmpegsource mp4 +system-libx264 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
 RDEPEND="
 	ffmpeg? ( media-video/ffmpeg )
+	ffmpegsource? ( media-libs/ffmpegsource )
 	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
 	system-libx264? ( ~media-libs/x264-${PV} )
 "
@@ -56,6 +59,7 @@
 	local myconf=""
 	use debug && myconf+=" --enable-debug"
 	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
+	use ffmpegsource || myconf+=" --disable-ffms"
 	use mp4 || myconf+=" --disable-gpac"
 	use system-libx264 && myconf+=" --system-libx264"
 	use threads || myconf+=" --disable-thread"
@@ -64,11 +68,9 @@
 		--prefix="${EPREFIX}"/usr \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--disable-avs \
-		--disable-ffms \
 		--extra-asflags="${ASFLAGS}" \
 		--extra-cflags="${CFLAGS}" \
 		--extra-ldflags="${LDFLAGS}" \
 		--host="${CHOST}" \
-		${myconf} \
-		|| die
+		${myconf} || die
 }