summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-13 00:55:26 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-13 00:55:26 +0100
commit19480c300bf8f5e43b07f6025062e72ecb6ea7b2 (patch)
treec8254dc0ea051b181d51761f50684a19d8ceb037
parent49884786e3f639a89910c27bdfc96dfe0f7799b1 (diff)
downloadxine-lib-19480c300bf8f5e43b07f6025062e72ecb6ea7b2.tar.gz
xine-lib-19480c300bf8f5e43b07f6025062e72ecb6ea7b2.tar.bz2
Switch to using external ffmpeg by default.
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 1 deletions
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])