diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-03 19:38:40 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-03 19:38:40 +0000 |
| commit | 47d4010afba7ad750b7cc3a3e36c342e704e462b (patch) | |
| tree | 2f5fc8636b1c2e72b52c76394cc2e1002109cee8 /configure.ac | |
| parent | b52042f6dbb75f2d43179e859358f79995671fa7 (diff) | |
| download | gstreamer-plugins-bad-47d4010afba7ad750b7cc3a3e36c342e704e462b.tar.gz | |
Update xvid plugin to latest xvid (1.0.0-beta3) API.
Original commit message from CVS:
2004-01-03 Ronald Bultje <rbultje@ronald.bitfreak.net>
reviewed by: <delete if not using a buddy>
* configure.ac:
* ext/xvid/gstxvid.c: (gst_xvid_init), (gst_xvid_error),
(gst_xvid_structure_to_csp), (gst_xvid_csp_to_caps):
* ext/xvid/gstxvid.h:
* ext/xvid/gstxviddec.c: (gst_xviddec_class_init),
(gst_xviddec_init), (gst_xviddec_setup), (gst_xviddec_chain),
(gst_xviddec_src_link), (gst_xviddec_sink_link),
(gst_xviddec_change_state):
* ext/xvid/gstxviddec.h:
* ext/xvid/gstxvidenc.c: (gst_xvidenc_profile_get_type),
(gst_xvidenc_base_init), (gst_xvidenc_class_init),
(gst_xvidenc_init), (gst_xvidenc_setup), (gst_xvidenc_chain),
(gst_xvidenc_link), (gst_xvidenc_set_property),
(gst_xvidenc_get_property), (gst_xvidenc_change_state):
* ext/xvid/gstxvidenc.h:
Update xvid plugin to latest xvid (1.0.0-beta3) API.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index e096694f6..716a15624 100644 --- a/configure.ac +++ b/configure.ac @@ -1289,21 +1289,30 @@ GST_CHECK_FEATURE(VORBIS, [vorbis plug-in], vorbisenc vorbisdec, [ dnl *** XVID *** translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true) GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [ - HAVE_XVID=yes - AC_CHECK_HEADER(xvid.h, , - [ AC_MSG_WARN([Xvid headers not found]) && - HAVE_XVID=no ] ) - LIBS="-lm" - AC_CHECK_LIB(xvidcore, xvid_encore, , - [ AC_MSG_WARN([Xvid encore libs not found]) && - HAVE_XVID=no ] ) - AC_CHECK_LIB(xvidcore, xvid_decore, , - [ AC_MSG_WARN([Xvid decore libs not found]) && - HAVE_XVID=no ] ) - if test x$HAVE_XVID = xyes; then - XVID_LIBS="-lxvidcore -lm" - AC_SUBST(XVID_LIBS) - fi + HAVE_XVID=no + AC_CHECK_HEADER(xvid.h, [ + OLD_LIBS="$LIBS" + LIBS="-lm" + AC_CHECK_LIB(xvidcore, xvid_encore, [ + AC_CHECK_LIB(xvidcore, xvid_decore, [ + AC_CHECK_LIB(xvidcore, xvid_global, [ + AC_MSG_CHECKING([for uptodate XviD API version]) + AC_TRY_RUN([ +#include <xvid.h> +#if XVID_API != XVID_MAKE_API(4,0) +#error "Incompatible XviD API version" +#endif +int main () { return 0; } + ],[ AC_MSG_RESULT(yes) + XVID_LIBS="-lxvidcore -lm" + AC_SUBST(XVID_LIBS) + HAVE_XVID=yes + ], AC_MSG_RESULT(no) ) + ], ) + ], ) + ], ) + LIBS="$OLD_LIBS" + ], ) ]) |