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

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

Revision: 526
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=526&view=rev
Author:   nickols_k
Date:     2012-12-08 14:01:01 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
segfault--

Modified Paths:
--------------
    mplayerxp/libmpcodecs/dec_video.cpp
    mplayerxp/libvo/video_out.cpp

Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp	2012-12-08 13:40:58 UTC (rev 525)
+++ mplayerxp/libmpcodecs/dec_video.cpp	2012-12-08 14:01:01 UTC (rev 526)
@@ -301,13 +301,11 @@
 		for(i=j;i<smp_num_cpus;i++) {
 		    MSG_DBG2("parallel: dec_video.put_slice[%ux%u] %i %i %i %i\n",ampi[i]->width,ampi[i]->height,ampi[i]->x,ampi[i]->y,ampi[i]->w,ampi[i]->h);
 		    vf_put_slice(s,ampi[i]);
-		    free_mp_image(ampi[i]);
 		}
 	    }
 	    for(;j<num_slices;j++) {
 		MSG_DBG2("par_tail: dec_video.put_slice[%ux%u] %i %i %i %i\n",ampi[i]->width,ampi[i]->height,ampi[i]->x,ampi[i]->y,ampi[i]->w,ampi[i]->h);
 		vf_put_slice(s,ampi[j]);
-		free_mp_image(ampi[j]);
 	    }
 	}
 	else
@@ -317,9 +315,9 @@
 	    for(i=0;i<num_slices;i++) {
 		MSG_DBG2("dec_video.put_slice[%ux%u] %i %i %i %i -> [%i]\n",ampi[i]->width,ampi[i]->height,ampi[i]->x,ampi[i]->y,ampi[i]->w,ampi[i]->h,ampi[i]->xp_idx);
 		vf_put_slice(s,ampi[i]);
-		free_mp_image(ampi[i]);
 	    }
 	}
+	for(i=0;i<num_slices;i++) free_mp_image(ampi[i]);
     } else {
 	MSG_DBG2("Put whole frame[%ux%u]\n",mpi->width,mpi->height);
 	vf_put_slice(s,mpi);

Modified: mplayerxp/libvo/video_out.cpp
===================================================================
--- mplayerxp/libvo/video_out.cpp	2012-12-08 13:40:58 UTC (rev 525)
+++ mplayerxp/libvo/video_out.cpp	2012-12-08 14:01:01 UTC (rev 526)
@@ -577,7 +577,7 @@
 	    ps_src[i] = mpi->planes[i]+(y*mpi->stride[i])+x+priv.ps_off[i];
 	}
 	for(i=0;i<4;i++) {
-	    if(mpi->stride[i]) {
+	    if(mpi->stride[i] && dstStride[i]) {
 		if(finalize)
 		    stream_copy_pic(dst[i],ps_src[i],_w[i],_h[i],dstStride[i],mpi->stride[i]);
 		else

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