mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 09:40:37 +00:00
Make resindvd work with libdvdnav >= 4.0.0.
Original commit message from CVS: * configure.ac: * ext/resindvd/resindvdsrc.h: Make resindvd work with libdvdnav >= 4.0.0.
This commit is contained in:
parent
0951e00dc0
commit
aacf6838eb
3 changed files with 20 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2008-06-17 Sebastian Dröge <slomo@circular-chaos.org>
|
||||||
|
|
||||||
|
* configure.ac:
|
||||||
|
* ext/resindvd/resindvdsrc.h:
|
||||||
|
Make resindvd work with libdvdnav >= 4.0.0.
|
||||||
|
|
||||||
2008-06-17 Jan Schmidt <thaytan@noraisin.net>
|
2008-06-17 Jan Schmidt <thaytan@noraisin.net>
|
||||||
|
|
||||||
* configure.ac:
|
* configure.ac:
|
||||||
|
|
|
@ -234,6 +234,7 @@ AG_GST_CHECK_PLUGIN(app)
|
||||||
AG_GST_CHECK_PLUGIN(bayer)
|
AG_GST_CHECK_PLUGIN(bayer)
|
||||||
AG_GST_CHECK_PLUGIN(cdxaparse)
|
AG_GST_CHECK_PLUGIN(cdxaparse)
|
||||||
AG_GST_CHECK_PLUGIN(deinterlace)
|
AG_GST_CHECK_PLUGIN(deinterlace)
|
||||||
|
AG_GST_CHECK_PLUGIN(deinterlace2)
|
||||||
AG_GST_CHECK_PLUGIN(dvdspu)
|
AG_GST_CHECK_PLUGIN(dvdspu)
|
||||||
AG_GST_CHECK_PLUGIN(festival)
|
AG_GST_CHECK_PLUGIN(festival)
|
||||||
AG_GST_CHECK_PLUGIN(filter)
|
AG_GST_CHECK_PLUGIN(filter)
|
||||||
|
@ -499,13 +500,15 @@ AG_GST_CHECK_FEATURE(DVDNAV, [dvdnav library], resindvd, [
|
||||||
[[ "$DVDNAV_MICRO" -lt "7" ]]; then
|
[[ "$DVDNAV_MICRO" -lt "7" ]]; then
|
||||||
AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION])
|
AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION])
|
||||||
HAVE_DVDNAV="no"
|
HAVE_DVDNAV="no"
|
||||||
|
elif [[ "$DVDNAV_MAJOR" -eq "0" ]]; then
|
||||||
|
AC_DEFINE(DVDNAV_OLD, 1, [Define if an old libdvdnav is used])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
dnl now check for dvdread/nav_print.h - see #133002
|
dnl now check for dvdread/nav_print.h - see #133002
|
||||||
AC_CHECK_HEADER(dvdread/nav_print.h, , [
|
AC_CHECK_HEADER(dvdread/nav_print.h, , [
|
||||||
AC_MSG_WARN([header dvdread/nav_print.h from dvdread missing])
|
AC_MSG_WARN([header dvdread/nav_print.h from dvdread missing])
|
||||||
HAVE_DVDNAV="no"
|
HAVE_DVDNAV="no"
|
||||||
])
|
], [ #include "_stdint.h" ])
|
||||||
AS_SCRUB_INCLUDE(DVDNAV_CFLAGS)
|
AS_SCRUB_INCLUDE(DVDNAV_CFLAGS)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -1183,6 +1186,7 @@ gst/app/Makefile
|
||||||
gst/bayer/Makefile
|
gst/bayer/Makefile
|
||||||
gst/cdxaparse/Makefile
|
gst/cdxaparse/Makefile
|
||||||
gst/deinterlace/Makefile
|
gst/deinterlace/Makefile
|
||||||
|
gst/deinterlace2/Makefile
|
||||||
gst/dvdspu/Makefile
|
gst/dvdspu/Makefile
|
||||||
gst/festival/Makefile
|
gst/festival/Makefile
|
||||||
gst/filter/Makefile
|
gst/filter/Makefile
|
||||||
|
|
|
@ -25,12 +25,21 @@
|
||||||
|
|
||||||
#include "_stdint.h"
|
#include "_stdint.h"
|
||||||
|
|
||||||
|
#ifndef DVDNAV_OLD
|
||||||
|
|
||||||
|
#include <dvdnav/dvdnav.h>
|
||||||
|
#include <dvdread/ifo_read.h>
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
#include <dvdnav/dvd_reader.h>
|
#include <dvdnav/dvd_reader.h>
|
||||||
#include <dvdnav/ifo_read.h>
|
#include <dvdnav/ifo_read.h>
|
||||||
|
|
||||||
#include <dvdnav/dvdnav.h>
|
#include <dvdnav/dvdnav.h>
|
||||||
#include <dvdnav/nav_print.h>
|
#include <dvdnav/nav_print.h>
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
#define RESIN_TYPE_DVDSRC (rsn_dvdsrc_get_type())
|
#define RESIN_TYPE_DVDSRC (rsn_dvdsrc_get_type())
|
||||||
|
|
Loading…
Reference in a new issue