From fd1a08e15fea8cc95610449fdd6a74f681900ba1 Mon Sep 17 00:00:00 2001
From: Christian Schaller <uraeus@gnome.org>
Date: Sun, 12 Dec 2004 12:05:38 +0000
Subject: merge patch from 158258

Original commit message from CVS:
merge patch from 158258
---
 ChangeLog    | 5 +++++
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b2615bfd..98504335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-12  Christian Fredrik Kalager Schaller  <christian at fluendo dot com>
+
+	* configure.ac: Update polyaudio requirement to 0.7
+	* ext/polyp/polypsink.c: (create_stream): add patch from iain (158258)
+
 2004-12-11  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* gst/interleave/deinterleave.c:
diff --git a/configure.ac b/configure.ac
index 44b25d8d..2d64fbec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1429,7 +1429,7 @@ GST_CHECK_FEATURE(PANGO, [pango], pango, [
 dnl *** polypaudio ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_POLYP, true)
 GST_CHECK_FEATURE(POLYP, [polyp], polyp, [
-  PKG_CHECK_MODULES(POLYP, polyplib >= 0.6,
+  PKG_CHECK_MODULES(POLYP, polyplib >= 0.7,
       HAVE_POLYP="yes", HAVE_POLYP="no")
   AC_SUBST(POLYP_CFLAGS)
   AC_SUBST(POLYP_CFLAGS)
-- 
cgit