summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2002-03-18 10:52:39 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2002-03-18 10:52:39 +0000
commit0493abb482f6a555870495f5eb25600bc5bd53fb (patch)
tree6d4e9d7596979c2fc4df627b96fe19d2f7158fd7 /src
parent5f595f80419cc88ecce06ae02184966b81b809a9 (diff)
downloadxine-lib-0493abb482f6a555870495f5eb25600bc5bd53fb.tar.gz
xine-lib-0493abb482f6a555870495f5eb25600bc5bd53fb.tar.bz2
xine_log bugfix by bill fink
CVS patchset: 1584 CVS date: 2002/03/18 10:52:39
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_avi.c4
-rw-r--r--src/xine-engine/xine.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 22a1c2eb1..1e8eb3d68 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.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_avi.c,v 1.69 2002/03/18 02:19:45 guenter Exp $
+ * $Id: demux_avi.c,v 1.70 2002/03/18 10:52:39 guenter Exp $
*
* demultiplexer for avi streams
*
@@ -987,6 +987,8 @@ static void demux_avi_start (demux_plugin_t *this_gen,
* seek to start pos / time
*/
+ printf ("demux_avi: start pos is %lld, start time is %d\n", start_pos, start_time);
+
/* seek video */
if (start_pos) {
while ( (this->avi->video_index[this->avi->video_posf].pos < start_pos)
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index aa17f4858..4f18d5dac 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.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: xine.c,v 1.109 2002/03/14 13:57:15 miguelfreitas Exp $
+ * $Id: xine.c,v 1.110 2002/03/18 10:52:39 guenter Exp $
*
* top-level xine functions
*
@@ -876,6 +876,9 @@ void xine_log (xine_t *this, int buf, const char *format, ...) {
va_start (argp, format);
this->log_buffers[buf]->scratch_printf (this->log_buffers[buf], format, argp);
+ va_end (argp);
+
+ va_start (argp, format);
vprintf (format, argp);