From 09540cea75eec21b36fb32c6aa3c42d9aca4612d Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 7 Jul 2005 19:23:24 +0000 Subject: 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". --- ChangeLog | 7 +++++++ common | 2 +- configure.ac | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6332f04..f1f692a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-07-07 Benjamin Otte + + * 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 * gst/matroska/matroska-mux.c: (gst_matroska_mux_loop): diff --git a/common b/common index 4ca96aed..03aa1cd7 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 4ca96aedcf2be0b3dcf31fce732aed1da21b8850 +Subproject commit 03aa1cd7f77f87fc24565044c0a3c9c5124c39a4 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 -#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; } -- cgit v1.2.1