From 19480c300bf8f5e43b07f6025062e72ecb6ea7b2 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sun, 13 Jul 2008 00:55:26 +0100
Subject: Switch to using external ffmpeg by default.

---
 ChangeLog    | 1 +
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3edadc2a1..f9cfafbb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 xine-lib (1.1.15) 2008-??-??
+  * Use external ffmpeg by default.
   * V4L: Don't segfault if asked for an input that doesn't exist
 
 xine-lib (1.1.14) 2008-06-29
diff --git a/configure.ac b/configure.ac
index e8abfc211..0527bed4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,7 +328,7 @@ case "x$with_external_ffmpeg" in
 			[AC_MSG_RESULT(no); with_external_ffmpeg=no])
       ;;
 esac
-if test "x$with_external_ffmpeg" = "xyes"; then
+if test "x$with_external_ffmpeg" != "xno"; then
    PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc])
    AC_SUBST([FFMPEG_CFLAGS])
    AC_SUBST([FFMPEG_LIBS])
-- 
cgit v1.2.3