From c0706275ed16742358b6433124bdb3958309ad21 Mon Sep 17 00:00:00 2001
From: James Courtier-Dutton <jcdutton@users.sourceforge.net>
Date: Tue, 10 Sep 2002 14:06:33 +0000
Subject: Fix a segfault in XV output. redraw is being called too early.

CVS patchset: 2645
CVS date: 2002/09/10 14:06:33
---
 src/xine-engine/configfile.c | 4 ++--
 src/xine-engine/vo_scale.c   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 0da8d7c04..907860ca9 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.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: configfile.c,v 1.28 2002/09/09 20:40:27 uid86226 Exp $
+ * $Id: configfile.c,v 1.29 2002/09/10 14:06:33 jcdutton Exp $
  *
  * config object (was: file) management - implementation
  *
@@ -139,7 +139,7 @@ static char *_xine_config_register_string (config_values_t *this,
      * it to default value 
      */
     if(!entry->unknown_value)
-      entry->unknown_value = strdup(def_value);
+      entry->unknown_value = copy_string(def_value);
     
     /* 
      * Check for sticky string
diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c
index cceaf68d3..6cd559e68 100644
--- a/src/xine-engine/vo_scale.c
+++ b/src/xine-engine/vo_scale.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: vo_scale.c,v 1.8 2002/09/08 16:52:57 mroi Exp $
+ * $Id: vo_scale.c,v 1.9 2002/09/10 14:06:33 jcdutton Exp $
  * 
  * Contains common code to calculate video scaling parameters.
  * In short, it will map frame dimensions to screen/window size.
@@ -245,7 +245,11 @@ int vo_scale_redraw_needed (vo_scale_t *this) {
   int gui_x, gui_y, gui_width, gui_height, gui_win_x, gui_win_y;
   double gui_pixel_aspect;
   int ret = 0;
-  
+  if( (this->delivered_width == 0) || 
+      (this->delivered_height == 0) || 
+      (this->video_pixel_aspect == 0) ) {
+        return 0;
+  }
   if( this->frame_output_cb ) {
     this->frame_output_cb (this->user_data,
 			   this->delivered_width, this->delivered_height, 
-- 
cgit v1.2.3