From b5916a63216198c12e2431610de34e12f0a76035 Mon Sep 17 00:00:00 2001
From: Miguel Freitas <miguelfreitas@users.sourceforge.net>
Date: Sun, 31 Oct 2004 22:29:04 +0000
Subject: last fixes...

CVS patchset: 7098
CVS date: 2004/10/31 22:29:04
---
 src/input/input_v4l.c         | 7 -------
 src/xine-engine/input_cache.c | 5 +++--
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 262c27441..0e62343b2 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -965,10 +965,6 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
     store_vid_frame(frame);
   }
   
-  /* Using deinterlaceing is highly recommended. Setting to true */
-  this->old_interlace = xine_get_param(this->stream, XINE_PARAM_VO_DEINTERLACE);
-  xine_set_param(this->stream, XINE_PARAM_VO_DEINTERLACE, 1);
-  
   /* Strip the vbi / sync signal from the image by zooming in */ 
   this->old_zoomx = xine_get_param(this->stream, XINE_PARAM_VO_ZOOM_X);
   this->old_zoomy = xine_get_param(this->stream, XINE_PARAM_VO_ZOOM_Y);
@@ -1543,9 +1539,6 @@ static void v4l_plugin_dispose (input_plugin_t *this_gen) {
     else
       lprintf("Video device succesfully closed\n");
     
-    /* Restore interlace setting */
-    xine_set_param(this->stream, XINE_PARAM_VO_DEINTERLACE, this->old_interlace);
-    
     /* Restore zoom setting */ 
     xine_set_param(this->stream, XINE_PARAM_VO_ZOOM_X, this->old_zoomx);
     xine_set_param(this->stream, XINE_PARAM_VO_ZOOM_Y, this->old_zoomy);
diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c
index ea240d06d..5d859a828 100644
--- a/src/xine-engine/input_cache.c
+++ b/src/xine-engine/input_cache.c
@@ -22,7 +22,7 @@
  * The goal of this input plugin is to reduce 
  * the number of calls to the real input plugin.
  *
- * $Id: input_cache.c,v 1.2 2004/10/30 13:34:33 miguelfreitas Exp $
+ * $Id: input_cache.c,v 1.3 2004/10/31 22:29:07 miguelfreitas Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -195,7 +195,8 @@ static buf_element_t *cache_plugin_read_block(input_plugin_t *this_gen, fifo_buf
     buf = this->main_input_plugin->read_block(this->main_input_plugin, fifo, todo);
     this->read_call++;
     this->main_read_call++;
-    this->cur_pos += buf->size;
+    if(buf)
+      this->cur_pos += buf->size;
   }
   return buf;
 }
-- 
cgit v1.2.3