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

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

Revision: 318
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=318&view=rev
Author:   nickols_k
Date:     2012-11-10 12:07:07 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
segfaults--

Modified Paths:
--------------
    ffmpeg/doc/examples/pc-uninstalled/libswresample.pc
    mplayerxp/libmpcodecs/dec_audio.c
    mplayerxp/mplayerxp.c
    mplayerxp/postproc/af_volnorm.c
    mplayerxp/postproc/af_volume.c

Modified: ffmpeg/doc/examples/pc-uninstalled/libswresample.pc
===================================================================
--- ffmpeg/doc/examples/pc-uninstalled/libswresample.pc	2012-11-10 11:22:10 UTC (rev 317)
+++ ffmpeg/doc/examples/pc-uninstalled/libswresample.pc	2012-11-10 12:07:07 UTC (rev 318)
@@ -8,5 +8,5 @@
 Version: 0.15.100
 Requires: libavutil = 51.73.101
 Conflicts:
-Libs: -L${libdir} -lswresample -lm
+Libs: -L${libdir} -lswresample64 -lm
 Cflags: -I${includedir}

Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c	2012-11-10 11:22:10 UTC (rev 317)
+++ mplayerxp/libmpcodecs/dec_audio.c	2012-11-10 12:07:07 UTC (rev 318)
@@ -133,6 +133,7 @@
 
 void mpca_uninit(sh_audio_t *sh_audio)
 {
+    if(!sh_audio) return;
     if(sh_audio->afilter){
 	MSG_V("Uninit audio filters...\n");
 	af_uninit(sh_audio->afilter);

Modified: mplayerxp/mplayerxp.c
===================================================================
--- mplayerxp/mplayerxp.c	2012-11-10 11:22:10 UTC (rev 317)
+++ mplayerxp/mplayerxp.c	2012-11-10 12:07:07 UTC (rev 318)
@@ -2030,7 +2030,7 @@
 	}
 	usleep(250000);
 //read_input:
-	vo_check_events(vo_data);
+	if(sh_video) vo_check_events(vo_data);
 repaint:
 #ifdef USE_OSD
 	if((mpxp_paint_osd(&osd.visible,&in_pause))!=0) goto repaint;

Modified: mplayerxp/postproc/af_volnorm.c
===================================================================
--- mplayerxp/postproc/af_volnorm.c	2012-11-10 11:22:10 UTC (rev 317)
+++ mplayerxp/postproc/af_volnorm.c	2012-11-10 12:07:07 UTC (rev 318)
@@ -71,7 +71,7 @@
 // Initialization and runtime control
 static MPXP_Rc __FASTCALL__ control(struct af_instance_s* af, int cmd, any_t* arg)
 {
-  af_volnorm_t* s   = (af_volnorm_t*)af->setup; 
+  af_volnorm_t* s   = (af_volnorm_t*)af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:
@@ -81,8 +81,8 @@
     af->data->rate   = ((mp_aframe_t*)arg)->rate;
     af->data->nch    = ((mp_aframe_t*)arg)->nch;
 
-    if(((mp_aframe_t*)arg)->format != (MPAF_F | MPAF_NE) &&
-       ((mp_aframe_t*)arg)->format != (MPAF_SI | MPAF_NE))
+    if(!(((mp_aframe_t*)arg)->format == (MPAF_F | MPAF_NE) ||
+       ((mp_aframe_t*)arg)->format == (MPAF_SI | MPAF_NE)))
        return MPXP_Error;
 
     if(((mp_aframe_t*)arg)->format == (MPAF_SI | MPAF_NE)){

Modified: mplayerxp/postproc/af_volume.c
===================================================================
--- mplayerxp/postproc/af_volume.c	2012-11-10 11:22:10 UTC (rev 317)
+++ mplayerxp/postproc/af_volume.c	2012-11-10 12:07:07 UTC (rev 318)
@@ -52,7 +52,7 @@
 // Initialization and runtime control
 static MPXP_Rc __FASTCALL__ control(struct af_instance_s* af, int cmd, any_t* arg)
 {
-  af_volume_t* s   = (af_volume_t*)af->setup; 
+  af_volume_t* s   = (af_volume_t*)af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:
@@ -85,22 +85,22 @@
     for(i=0;i<AF_NCH;i++) vol[i]=v;
     return control(af,AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, vol);
   }
-  case AF_CONTROL_POST_CREATE:	
-    s->fast = ((((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) == 
+  case AF_CONTROL_POST_CREATE:
+    s->fast = ((((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) ==
       AF_INIT_FLOAT) ? 0 : 1;
     return MPXP_Ok;
   case AF_CONTROL_VOLUME_ON_OFF | AF_CONTROL_SET:
     memcpy(s->enable,(int*)arg,AF_NCH*sizeof(int));
-    return MPXP_Ok; 
+    return MPXP_Ok;
   case AF_CONTROL_VOLUME_ON_OFF | AF_CONTROL_GET:
     memcpy((int*)arg,s->enable,AF_NCH*sizeof(int));
-    return MPXP_Ok; 
+    return MPXP_Ok;
   case AF_CONTROL_VOLUME_SOFTCLIP | AF_CONTROL_SET:
     s->soft = *(int*)arg;
-    return MPXP_Ok; 
+    return MPXP_Ok;
   case AF_CONTROL_VOLUME_SOFTCLIP | AF_CONTROL_GET:
     *(int*)arg = s->soft;
-    return MPXP_Ok; 
+    return MPXP_Ok;
   case AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET:
     return af_from_dB(AF_NCH,(float*)arg,s->level,20.0,-200.0,60.0);
   case AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_GET:
@@ -125,7 +125,7 @@
   return MPXP_Unknown;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void __FASTCALL__ uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -140,7 +140,7 @@
   mp_aframe_t*    c   = data;			// Current working data
   af_volume_t*  s   = (af_volume_t*)af->setup; 	// Setup for this instance
   int           ch  = 0;			// Channel counter
-  register int	nch = c->nch;			// Number of channels	
+  register int	nch = c->nch;			// Number of channels
   register int  i   = 0;
 
   // Basic operation volume control only (used on slow machines)

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