diff --git a/autoconf/m4/video.m4 b/autoconf/m4/video.m4
index 8b7d94f924..a2788263dc 100644
--- a/autoconf/m4/video.m4
+++ b/autoconf/m4/video.m4
@@ -7,6 +7,7 @@ AC_ARG_WITH(static-ffmpeg, AS_HELP_STRING([--with-static-ffmpeg],[Statically lin
 AM_CONDITIONAL(STATIC_FFMPEG, test "$with_static_ffmpeg" = "yes")
 AC_ARG_WITH(system-ffmpeg, AS_HELP_STRING([--with-system-ffmpeg], [Use system instead of bundled ffmpeg (UNSUPPORTED)]), system_ffmpeg=yes, system_ffmpeg=no)
 AM_CONDITIONAL(SYSTEM_FFMPEG, test "$system_ffmpeg" = "yes")
+AM_CONDITIONAL(WITHOUT_FFMPEG, test "$with_ffmpeg" != "yes")
 
 VIDEO_CFLAGS=
 VIDEO_LIBS=
diff --git a/bundle/Makefile.am b/bundle/Makefile.am
index f6a07544e2..896c503518 100644
--- a/bundle/Makefile.am
+++ b/bundle/Makefile.am
@@ -1,9 +1,11 @@
+if !WITHOUT_FFMPEG
 if !SYSTEM_FFMPEG
 all-local:
 	cd ffmpeg && $(MAKE) 
 if WINDOWS
 	cp ffmpeg/*/*.dll ..
 endif
+endif
 
 del-dlls:
 if WINDOWS