From 78864835c9ba05a5c7a4c449fb4613ab30fb91b7 Mon Sep 17 00:00:00 2001
From: jin_eld <jin_eld@f010a08f-7000-0410-b1fc-cb24403df210>
Date: Sun, 10 Jan 2010 20:34:38 +0000
Subject: [PATCH] fixed a problem where configure was complaining and aborted
 when --disable-ffmpeg option was specified

---
 configure.ac | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 095ef4c0..2ed8dc60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1570,7 +1570,13 @@ if test "x$FFMPEG_STATUS" = xyes; then
     AC_SUBST(FFMPEG_LDFLAGS)
     AC_SUBST(FFMPEG_LIBS)
 else
-    if test "x$FFMPEG_OPTION_REQUESTED" = xyes; then
+    if (test "x$FFMPEG_OPTION_ENABLED" != xyes); then
+        AC_MSG_NOTICE("SETTING FFMPEG TO DISABLED!\n");
+        FFMPEG_STATUS=disabled
+    fi
+
+    if (test "x$FFMPEG_OPTION_REQUESTED" = xyes) && 
+       (test "x$FFMPEG_OPTION_ENABLED" = xyes); then
         AC_MSG_ERROR(unable to configure ffmpeg support)
     fi
 fi