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.
This commit is contained in:
Ronald S. Bultje 2004-01-03 19:38:40 +00:00
parent 156d6766dc
commit 878e8c50b9

View file

@ -1289,21 +1289,30 @@ GST_CHECK_FEATURE(VORBIS, [vorbis plug-in], vorbisenc vorbisdec, [
dnl *** XVID *** dnl *** XVID ***
translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true) translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true)
GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [ GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
HAVE_XVID=yes HAVE_XVID=no
AC_CHECK_HEADER(xvid.h, , AC_CHECK_HEADER(xvid.h, [
[ AC_MSG_WARN([Xvid headers not found]) && OLD_LIBS="$LIBS"
HAVE_XVID=no ] ) LIBS="-lm"
LIBS="-lm" AC_CHECK_LIB(xvidcore, xvid_encore, [
AC_CHECK_LIB(xvidcore, xvid_encore, , AC_CHECK_LIB(xvidcore, xvid_decore, [
[ AC_MSG_WARN([Xvid encore libs not found]) && AC_CHECK_LIB(xvidcore, xvid_global, [
HAVE_XVID=no ] ) AC_MSG_CHECKING([for uptodate XviD API version])
AC_CHECK_LIB(xvidcore, xvid_decore, , AC_TRY_RUN([
[ AC_MSG_WARN([Xvid decore libs not found]) && #include <xvid.h>
HAVE_XVID=no ] ) #if XVID_API != XVID_MAKE_API(4,0)
if test x$HAVE_XVID = xyes; then #error "Incompatible XviD API version"
XVID_LIBS="-lxvidcore -lm" #endif
AC_SUBST(XVID_LIBS) int main () { return 0; }
fi ],[ AC_MSG_RESULT(yes)
XVID_LIBS="-lxvidcore -lm"
AC_SUBST(XVID_LIBS)
HAVE_XVID=yes
], AC_MSG_RESULT(no) )
], )
], )
], )
LIBS="$OLD_LIBS"
], )
]) ])