[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[629] mplayerxp

[<nic...@us...>]

Revision: 629
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=629&view=rev
Author:   nickols_k
Date:     2013-04-17 13:05:49 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
restore -vo fbdev efficiency

Modified Paths:
--------------
    mplayerxp/libvo2/vo_fbdev.cpp
    mplayerxp/main.cpp

Modified: mplayerxp/libvo2/vo_fbdev.cpp
===================================================================
--- mplayerxp/libvo2/vo_fbdev.cpp	2013-04-17 09:54:29 UTC (rev 628)
+++ mplayerxp/libvo2/vo_fbdev.cpp	2013-04-17 13:05:49 UTC (rev 629)
@@ -252,6 +252,7 @@
     }
 
     fb_preinit_done = 1;
+    pre_init_err= MPXP_Ok;
     fb_works = MPXP_Ok;
     return MPXP_Ok;
 err_out_tty_fd:
@@ -263,6 +264,7 @@
 err_out:
     fb_preinit_done = 1;
     fb_works = MPXP_False;
+    pre_init_err= MPXP_Error;
     return MPXP_False;
 }
 
@@ -889,7 +891,10 @@
 	mpxp_err<<FBDEV<< "Internal fatal error: init() was called before preinit()"<<std::endl;
 	return MPXP_False;
     }
-    if (pre_init_err!=MPXP_Ok) return MPXP_False;
+    if (pre_init_err!=MPXP_Ok) {
+	mpxp_err<<FBDEV<<"fb_prenit() was failed"<<std::endl;
+	return MPXP_False;
+    }
 
     if (priv_conf.mode_name && !flags&VOFLAG_MODESWITCHING) {
 	mpxp_err<<FBDEV<< "-fbmode can only be used with -vm"<<std::endl;

Modified: mplayerxp/main.cpp
===================================================================
--- mplayerxp/main.cpp	2013-04-17 09:54:29 UTC (rev 628)
+++ mplayerxp/main.cpp	2013-04-17 13:05:49 UTC (rev 629)
@@ -2078,7 +2078,6 @@
 	    str=str.substr(0,pos);
 	    envm[str]=stmp;
 	}
-	envp[j+1] = NULL;
 	/* init antiviral protection */
 	int rc;
 	rc=mp_mprotect((any_t*)antiviral_hole1,sizeof(antiviral_hole1),MP_DENY_ALL);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.