summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_mpeg_pes.c
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2006-10-16 22:18:24 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2006-10-16 22:18:24 +0000
commitfd821f5c182e0c6f2da2f299b7d1341affd0914f (patch)
tree4d6765e0e45102c4a69bf114f2e6ebe38297ea8d /src/demuxers/demux_mpeg_pes.c
parenteebe97a3fe85f26ec95ad237a327ed02a2a2bfb2 (diff)
downloadxine-lib-fd821f5c182e0c6f2da2f299b7d1341affd0914f.tar.gz
xine-lib-fd821f5c182e0c6f2da2f299b7d1341affd0914f.tar.bz2
Fixed several warnings (but warnings due to APIs not solved).
CVS patchset: 8344 CVS date: 2006/10/16 22:18:24
Diffstat (limited to 'src/demuxers/demux_mpeg_pes.c')
-rw-r--r--src/demuxers/demux_mpeg_pes.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index a49a3cc6b..cb9732e53 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2006 the xine project
*
* This file is part of xine, a free video player.
*
@@ -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_pes.c,v 1.36 2006/07/10 22:08:13 dgp85 Exp $
+ * $Id: demux_mpeg_pes.c,v 1.37 2006/10/16 22:18:24 valtri Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -75,7 +75,8 @@ typedef struct demux_mpeg_pes_s {
char cur_mrl[256];
- uint8_t *scratch, *scratch_base;
+ uint8_t *scratch;
+ void *scratch_base;
int64_t nav_last_end_pts;
int64_t nav_last_start_pts;