diff --git a/media-video/ffmpeg/ffmpeg-0.11.5.recipe b/media-video/ffmpeg/ffmpeg-0.11.5.recipe
index 6756e19ba..3ec3efc02 100644
--- a/media-video/ffmpeg/ffmpeg-0.11.5.recipe
+++ b/media-video/ffmpeg/ffmpeg-0.11.5.recipe
@@ -14,8 +14,12 @@ COPYRIGHT="
 SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.11.5.tar.bz2"
 CHECKSUM_SHA256="9492991f44d6757080f457c0aef83e68884dbfb925666806c7f7ea0389e5b8c0"
 REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+# WARNING: although this can be built with gcc2, the resulting binaries will
+# crash when decoding h263 or h264 videos in MediaPlayer. So gcc2 is stuck with
+# ffmpeg version 0.10. Do not unmark this as broken until the runtime issues are
+# actually fixed.
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
 	PATCHES="ffmpeg-0.11.5-gcc2.patch"
@@ -114,14 +118,17 @@ BUILD()
 		--enable-libspeex \
 		--enable-libtheora \
 		--enable-libvpx \
-		--disable-amd3dnow
+		--disable-amd3dnow --disable-optimizations --disable-stripping \
+		--disable-decoder=rv30 --disable-decoder=rv40 --disable-decoder=svq3 \
+		--disable-decoder=vp8 --disable-decoder=h264 --disable-parser=h264 \
+		--disable-decoder=h263
 
 	if [ "$effectiveTargetArchitecture" == "x86_64" ]; then
 		pic=-fPIC
 	else
 		pic=-fno-PIC
 	fi
-	make $jobArgs CFLAGS="$pic -std=gnu9x"
+	make $jobArgs CFLAGS="$pic -std=gnu9x -g"
 }
 
 INSTALL()