3 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 823d3ff92..e345e9948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,7 @@ AC_SUBST(LIBFFMPEG_CFLAGS)
 
 LIBMPEG2_CFLAGS=""
 LIBA52_CFLAGS=""
-LIBFFMPEG_CFLAGS="-DSIMPLE_IDCT -DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DUSE_FASTMEMCPY"
+LIBFFMPEG_CFLAGS="-DSIMPLE_IDCT -DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DUSE_FASTMEMCPY -DCONFIG_RISKY -DCONFIG_ENCODERS"
 
 AC_ARG_ENABLE(altivec,
 	[  --disable-altivec       use assembly codes for Motorola 74xx CPUs],
@@ -278,7 +278,7 @@ dnl ---------------------------------------------
 dnl tvmode support using nvtv
 dnl ---------------------------------------------
 
-AC_ARG_ENABLE(nvtv, [  --enable-nvtv           use nvtv for output fullscreen to TV  [default=yes]], enable_nvtv="$enableval", enable_nvtv=no)
+AC_ARG_ENABLE(nvtv, [  --enable-nvtv           use nvtv for output fullscreen to TV], enable_nvtv="$enableval", enable_nvtv=no)
 
 AC_MSG_CHECKING(for nvtv support)
 
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index 17307c0c2..8722d2d0a 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = fdctref.c motion_est_template.c svq3.c wmv2.c \
 	ppc/mpegvideo_ppc.c ppc/dsputil_altivec.h  ppc/idct_altivec.c \
 	imgresample.c motion_est.c
 
-AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -DCONFIG_RISKY -DCONFIG_ENCODERS
+AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
 noinst_LTLIBRARIES = libavcodec.la
diff --git a/src/libffmpeg/libavcodec/alpha/Makefile.am b/src/libffmpeg/libavcodec/alpha/Makefile.am
index 90fbf4c23..b7bb5f7ca 100644
--- a/src/libffmpeg/libavcodec/alpha/Makefile.am
+++ b/src/libffmpeg/libavcodec/alpha/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/misc/Makefile.common
 
+AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
+
 EXTRA_DIST = asm.h \
 	dsputil_alpha.c \
 	mpegvideo_alpha.c \