From ab439a95bb0e062605b0e7b2c86fd919d55527ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 5 Jul 2010 09:52:18 +0200
Subject: [PATCH] celt: Remove support for celt < 0.5

celt 0.5 was released more than a year ago and the bitstream is
incompatible with the current one anyway.
---
 configure.ac          | 11 ++---------
 ext/celt/gstceltenc.c |  6 ------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 39d65a335a..8fd2036e37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -573,15 +573,8 @@ AG_GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [
 dnl *** celt ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_CELT, true)
 AG_GST_CHECK_FEATURE(CELT, [celt], celt, [
-  PKG_CHECK_MODULES(CELT, celt >= 0.4.0, [
-          HAVE_CELT="yes"
-  ], [
-          AC_MSG_RESULT(no)
-	  HAVE_CELT="no"
-  ])
-
-  PKG_CHECK_MODULES(CELT_0_5, celt >= 0.5.0, [
-          AC_DEFINE([HAVE_CELT_0_5], 1, [Define if libcelt 0.5 is installed])
+  PKG_CHECK_MODULES(CELT, celt >= 0.5.0, [
+          AC_DEFINE([HAVE_CELT], 1, [Define if libcelt 0.5 is installed])
   ], [
           AC_MSG_RESULT(no)
   ])
diff --git a/ext/celt/gstceltenc.c b/ext/celt/gstceltenc.c
index f134cf4784..b041a0bf52 100644
--- a/ext/celt/gstceltenc.c
+++ b/ext/celt/gstceltenc.c
@@ -798,15 +798,9 @@ gst_celt_enc_encode (GstCeltEnc * enc, gboolean flush)
         celt_encode (enc->state, data, frame_size,
         GST_BUFFER_DATA (outbuf), bytes_per_packet);
 #else
-#ifdef HAVE_CELT_0_5
     outsize =
         celt_encode (enc->state, data, NULL,
         GST_BUFFER_DATA (outbuf), bytes_per_packet);
-#else
-    outsize =
-        celt_encode (enc->state, data,
-        GST_BUFFER_DATA (outbuf), bytes_per_packet);
-#endif
 #endif
 
     g_free (data);