--- ffmpeg-0.5_p20373.ebuild	2010-01-09 18:36:33.000000000 +0300
+++ ffmpeg-0.5_p20373-r1.ebuild	2010-01-10 07:59:31.000000000 +0300
@@ -100,6 +100,14 @@
 	# enabled by default
 	if use encode
 	then
+		if use bindist
+		then
+			use faac && ewarn "faac is nonfree and cannot be distributed; disabling
+			faac support."
+		else
+			use faac && myconf="${myconf} --enable-libfaac"
+			{ use faac ; } && myconf="${myconf} --enable-nonfree"
+		fi
 		use mp3 && myconf="${myconf} --enable-libmp3lame"
 		use vorbis && myconf="${myconf} --enable-libvorbis"
 		use theora && myconf="${myconf} --enable-libtheora"
@@ -136,14 +144,6 @@
 		# Crappy detection or our installation is weird, pick one (FIXME)
 		append-flags -I/usr/include/gsm
 	fi
-	if use bindist
-	then
-		use faac && ewarn "faac is nonfree and cannot be distributed; disabling
-		faac support."
-	else
-		use faac && myconf="${myconf} --enable-libfaac"
-		{ use faac ; } && myconf="${myconf} --enable-nonfree"
-	fi
 
 	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
 	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"