From bcb5258d7a6a16c37625a4106c84ada54c3deb09 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Tue, 16 Dec 2008 03:18:02 +0000
Subject: [PATCH] Fix FFMPEG/Provider support (PART 2)

Originally committed to SVN as r2504.
---
 configure.in | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index d913b4fb1..36faab5f0 100644
--- a/configure.in
+++ b/configure.in
@@ -451,11 +451,6 @@ if test "$with_ffmpeg" != "no"; then
   if test "$with_swscale" = "no" && test "$with_swscale_lib" = "no"; then
     with_ffmpeg="no";
   fi
-
-  if test "$with_ffmpeg" = "yes"; then
-    found_video_provider="yes"
-    AC_DEFINE(WITH_FFMPEG, 1, [Enable FFMPEG Video Provider])
-  fi
 fi
 
 AC_SUBST(SWSCALE_LDFLAGS)
@@ -466,7 +461,11 @@ AC_SUBST(AVUTIL_LDFLAGS)
 
 AC_ARG_WITH(provider-ffmpeg, [  --without-provider-ffmpeg        build without FFMPEG A/V provider. (default: auto)], ffmpeg_provider_disabled="(disabled)")
 
-AM_CONDITIONAL([HAVE_FFMPEG], [test "$with_provider_ffmpeg" = "yes"])
+if test "$with_ffmpeg" = "yes"; then
+  found_video_provider="yes"
+  with_provider_ffmpeg="yes"
+  AC_DEFINE(WITH_FFMPEG, 1, [Enable FFMPEG Video Provider])
+fi
 
 if test "$with_ffmpeg" = "no"; then
   with_provider_ffmpegsource="no"
@@ -475,6 +474,8 @@ if test "$with_ffmpeg" = "no"; then
   ffmpeg_provider_disabled="(disabled, requires FFMPEG)"
 fi
 
+AM_CONDITIONAL([HAVE_FFMPEG], [test "$with_provider_ffmpeg" = "yes"])
+
 AC_ARG_WITH(provider-ffmpegsource, [  --without-provider-ffmpegsource        build without FFmpegSource A/V provider. (default: auto)], ffmpegsource_provider_disabled="(disabled)")
 
 if test "$with_ffmpegsource" != "no"; then