[xine-cvs] CVS: xine-lib/src/demuxers demux_avi.c,1.219,1.220

[Thibaut M. <tma...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23690

Modified Files:
	demux_avi.c 
Log Message:
Fix a bug introduced by my last commit.
A newpts buffer was sent between the first and the second buffer.



Index: demux_avi.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_avi.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- demux_avi.c	5 Oct 2005 07:08:48 -0000	1.219
+++ demux_avi.c	1 Nov 2005 18:36:19 -0000	1.220
@@ -345,9 +345,9 @@
 
 static void check_newpts (demux_avi_t *this, int64_t pts, int video) {
 
-  if (pts && this->send_newpts) {
+  if (this->send_newpts) {
 
-    lprintf ("sending newpts %lld (video = %d diff = %lld)\n", pts, video, diff);
+    lprintf ("sending newpts %lld (video = %d)\n", pts, video);
 
     if (this->buf_flag_seek) {
       _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK);
@@ -2042,12 +2042,14 @@
 static int demux_avi_seek (demux_plugin_t *this_gen,
                            off_t start_pos, int start_time, int playing) {
   demux_avi_t *this = (demux_avi_t *) this_gen;
-  
+
   if (!this->streaming) {
+
     _x_demux_flush_engine (this->stream);
     this->seek_request    = 1;
     this->seek_start_pos  = start_pos;
     this->seek_start_time = start_time;
+
     this->status = DEMUX_OK;
   }
   return this->status;