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

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

Revision: 477
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=477&view=rev
Author:   nickols_k
Date:     2012-11-28 16:33:23 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
segfaults--

Modified Paths:
--------------
    mplayerxp/libmpcodecs/dec_video.cpp
    mplayerxp/libmpdemux/demux_mpg.cpp
    mplayerxp/libmpdemux/demuxer.cpp
    mplayerxp/libmpstream/stream.cpp

Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp	2012-11-28 15:49:24 UTC (rev 476)
+++ mplayerxp/libmpcodecs/dec_video.cpp	2012-11-28 16:33:23 UTC (rev 477)
@@ -166,7 +166,7 @@
 	memcpy(sh_video->codec->outfmt,vprobe->pix_fmt,sizeof(vprobe->pix_fmt));
 	priv->mpvdec=vfm_find_driver(vfm);
     }
-    if(sh_video->codec) {
+    if(priv->mpvdec) {
 	if(priv->mpvdec->init(sh_video,libinput)!=MPXP_Ok){
 	    MSG_ERR(MSGTR_CODEC_CANT_INITV);
 		delete sh_video->codec;

Modified: mplayerxp/libmpdemux/demux_mpg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.cpp	2012-11-28 15:49:24 UTC (rev 476)
+++ mplayerxp/libmpdemux/demux_mpg.cpp	2012-11-28 16:33:23 UTC (rev 477)
@@ -402,7 +402,6 @@
 	Demux_Packet* dp=ds->asf_packet;
 	dp->resize(dp->len+len);
 	stream_read(demux->stream,dp->buffer+dp->len,len);
-	dp->len+=len;
     }
     else
     {

Modified: mplayerxp/libmpdemux/demuxer.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer.cpp	2012-11-28 15:49:24 UTC (rev 476)
+++ mplayerxp/libmpdemux/demuxer.cpp	2012-11-28 16:33:23 UTC (rev 477)
@@ -399,7 +399,6 @@
   }
   if(ds->asf_packet){
     // mp_free unfinished .asf fragments:
-    delete ds->asf_packet->buffer;
     delete ds->asf_packet;
     ds->asf_packet=NULL;
   }
@@ -429,7 +428,6 @@
   {
     if(ds->asf_packet){
 	// mp_free unfinished .asf fragments:
-	delete ds->asf_packet->buffer;
 	delete ds->asf_packet;
 	ds->asf_packet=NULL;
     }

Modified: mplayerxp/libmpstream/stream.cpp
===================================================================
--- mplayerxp/libmpstream/stream.cpp	2012-11-28 15:49:24 UTC (rev 476)
+++ mplayerxp/libmpstream/stream.cpp	2012-11-28 16:33:23 UTC (rev 477)
@@ -246,6 +246,7 @@
   s->sector_size=STREAM_BUFFER_SIZE;
   s->buffer=new unsigned char [STREAM_BUFFER_SIZE];
   if(s->buffer==NULL) { delete s; return NULL; }
+  s->buf_len=STREAM_BUFFER_SIZE;
   stream_reset(s);
   return s;
 }

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