diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-09-19 05:01:57 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-09-19 05:01:57 +0000 |
| commit | f28b2a11a87ff7e1306087401c370cc720f0afa3 (patch) | |
| tree | 7a83eec98829d3098beb4bdefa6ea5a1985af576 | |
| parent | 7fcc8b6884be847d7b0326b500a1858bf926cac4 (diff) | |
| download | xine-lib-f28b2a11a87ff7e1306087401c370cc720f0afa3.tar.gz xine-lib-f28b2a11a87ff7e1306087401c370cc720f0afa3.tar.bz2 | |
Update configure.in for new libdvdnav version.
Get DVD support to compile.
FIXME: We need to sort out the nav_types.h include file.
Basically, Which version of it should we use ?
CVS patchset: 2704
CVS date: 2002/09/19 05:01:57
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 6 | ||||
| -rw-r--r-- | src/libspudec/spu_decoder_api.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 24c968d06..97033b4ba 100644 --- a/configure.in +++ b/configure.in @@ -622,7 +622,7 @@ AM_CONDITIONAL(HAVE_CDROM_IOCTLS, [test x"$have_cdrom_ioctls" = "xyes"]) dnl dnl check for a usable version of libdvdnav dnl -AM_PATH_DVDNAV(0.1.3, +AM_PATH_DVDNAV(0.1.4, AC_DEFINE(HAVE_DVDNAV), [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) AM_CONDITIONAL(HAVE_DVDNAV, [test x"$no_dvdnav" != "xyes"]) diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 3795b4540..b8400f80b 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.115 2002/09/18 22:12:17 guenter Exp $ + * $Id: demux_mpeg_block.c,v 1.116 2002/09/19 05:01:57 jcdutton Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -384,9 +384,9 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m if (this->nav_last_end_pts != start_pts && !preview_mode) { -#ifdef LOG +//#ifdef LOG printf("demux_mpeg_block: discontinuity detected by nav packet\n" ); -#endif +//#endif if (this->buf_flag_seek) { xine_demux_control_newpts(this->xine, start_pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; diff --git a/src/libspudec/spu_decoder_api.h b/src/libspudec/spu_decoder_api.h index e863ac8ac..34ed1b0f4 100644 --- a/src/libspudec/spu_decoder_api.h +++ b/src/libspudec/spu_decoder_api.h @@ -25,6 +25,9 @@ #define HAVE_SPU_API_H #define SPU_DECODER_IFACE_VERSION 9 +/* FIXME: Needed for spu_button_t */ +/* But will not be on all users's systems. (From the libspudec directory or libdvdread). */ +/*#include "nav_types.h" */ /* * generic xine spu decoder plugin interface |