configure.ac: fix xvid detection, so that we work with the new 4.1 API. This is supposed to work, because (I quote xv...

Original commit message from CVS:
* configure.ac:
fix xvid detection, so that we work with the new 4.1 API. This is
supposed to work, because (I quote xvid.h) "$minor is incremented
when the api is changed, but remains backwards compatible".

3 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c6332f04..f1f692a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-07  Benjamin Otte  <otte@gnome.org>
+
+	* configure.ac:
+	  fix xvid detection, so that we work with the new 4.1 API. This is
+	  supposed to work, because (I quote xvid.h) "$minor is incremented 
+	  when the api is changed, but remains backwards compatible".
+
 2005-07-06  Arwed v. Merkatz  <v.merkatz@gmx.net>
 
 	* gst/matroska/matroska-mux.c: (gst_matroska_mux_loop):
diff --git a/common b/common
-Subproject 4ca96aedcf2be0b3dcf31fce732aed1da21b885
+Subproject 03aa1cd7f77f87fc24565044c0a3c9c5124c39a
diff --git a/configure.ac b/configure.ac
index c9ae4335..0eebb1a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1788,7 +1788,7 @@ GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
           AC_MSG_CHECKING([for uptodate XviD API version])
           AC_TRY_RUN([
 #include <xvid.h>
-#if XVID_API != XVID_MAKE_API(4,0)
+#if XVID_API_MAJOR(XVID_API) != 4
 #error "Incompatible XviD API version"
 #endif
 int main () { return 0; }