From: Tim-Philipp Müller <tim@centricular.com>
Date: Sat, 22 Nov 2014 21:28:35 +0000 (+0000)
Subject: speex: remove support for ancient speex versions
X-Git-Tag: 1.19.3~509^2~4045
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c53747bdf5c9ac46e55df98a0c4ac704de7419c4;p=platform%2Fupstream%2Fgstreamer.git

speex: remove support for ancient speex versions
---

diff --git a/configure.ac b/configure.ac
index c8f2188930..6a395c0a27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -743,47 +743,10 @@ AG_GST_CHECK_FEATURE(SOUP, [soup http client plugin (2.4)], souphttpsrc, [
   AC_SUBST(SOUP_LIBS)
 ])
 
-dnl *** speex >= 1.0.4 or >= 1.1.5 ***
-dnl   1.1.4 and earlier were not API/ABI compatible with 1.0
-dnl   1.1.6 is the first to use a .pc/pkg-config file ***
-dnl   speex_jitter.h is 1.1.x only
+dnl *** speex ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_SPEEX, true)
 AG_GST_CHECK_FEATURE(SPEEX, [speex speech codec], speex, [
   AG_GST_PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6)
-  if test $HAVE_SPEEX = no
-  then
-    AG_GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex/speex.h, [
-      AC_CHECK_HEADER(speex/speex_jitter.h, [
-        dnl speex 1.1.x :
-        AG_GST_CHECK_LIBHEADER(SPEEX, speex, speex_encode_int, , speex/speex.h, [
-          dnl speex 1.1.5 or + :
-          HAVE_SPEEX="yes"
-          SPEEX_LIBS="-lspeex"
-          AC_SUBST(SPEEX_CFLAGS)
-          AC_SUBST(SPEEX_LIBS)
-        ],[
-          HAVE_SPEEX="no"
-        ])
-      ],[
-        dnl speex 1.0.x :
-          AC_CHECK_DECL(SPEEX_GET_LOOKAHEAD, [
-            dnl speex 1.0.4
-            HAVE_SPEEX="yes"
-            SPEEX_LIBS="-lspeex"
-            AC_SUBST(SPEEX_CFLAGS)
-            AC_SUBST(SPEEX_LIBS)
-
-            AC_DEFINE_UNQUOTED(SPEEX_1_0, 1,
-              [defined if speex 1.0.x API detected])
-        ],[
-            HAVE_SPEEX="no"
-            AC_MSG_NOTICE(You need at least 1.0.4 to compile the speex plugin)
-        ], [
-#include <speex/speex.h>
-        ])
-      ])
-    ])
-  fi
 ])
 
 dnl *** taglib ***
diff --git a/ext/speex/gstspeexdec.h b/ext/speex/gstspeexdec.h
index ce45e813c5..5e1e17173a 100644
--- a/ext/speex/gstspeexdec.h
+++ b/ext/speex/gstspeexdec.h
@@ -50,11 +50,7 @@ struct _GstSpeexDec {
 
   void                  *state;
   SpeexStereoState      *stereo;
-#ifdef SPEEX_1_0
-  SpeexMode             *mode;
-#else
   const SpeexMode       *mode;
-#endif
   SpeexHeader           *header;
   SpeexCallback         callback;
   SpeexBits             bits;
diff --git a/ext/speex/gstspeexenc.h b/ext/speex/gstspeexenc.h
index b089cb2ae6..29fcc72a12 100644
--- a/ext/speex/gstspeexenc.h
+++ b/ext/speex/gstspeexenc.h
@@ -57,11 +57,7 @@ struct _GstSpeexEnc {
 
   SpeexBits             bits;
   SpeexHeader           header;
-#ifdef SPEEX_1_0
-  SpeexMode             *speex_mode;
-#else
   const SpeexMode       *speex_mode;
-#endif
   void                  *state;
 
   /* properties */