View | Details | Raw Unified
Collapse All | Expand All

(-) libmpdemux/demux_real.c (+3 lines)
 Lines 947-952    Link Here  
			    // last fragment!
			    // last fragment!
			    if(dp_hdr->len!=vpkg_length-vpkg_offset)
			    if(dp_hdr->len!=vpkg_length-vpkg_offset)
				mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d  frag.len=%d  total.len=%d  \n",dp->len,vpkg_offset,vpkg_length-vpkg_offset);
				mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d  frag.len=%d  total.len=%d  \n",dp->len,vpkg_offset,vpkg_length-vpkg_offset);
			    if (vpkg_offset > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) vpkg_offset = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
 
            		    stream_read(demuxer->stream, dp_data+dp_hdr->len, vpkg_offset);
            		    stream_read(demuxer->stream, dp_data+dp_hdr->len, vpkg_offset);
			    if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
			    if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
			    dp_hdr->len+=vpkg_offset;
			    dp_hdr->len+=vpkg_offset;
 Lines 970-975    Link Here  
			// non-last fragment:
			// non-last fragment:
			if(dp_hdr->len!=vpkg_offset)
			if(dp_hdr->len!=vpkg_offset)
			    mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d  offset=%d  frag.len=%d  total.len=%d  \n",dp->len,vpkg_offset,len,vpkg_length);
			    mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d  offset=%d  frag.len=%d  total.len=%d  \n",dp->len,vpkg_offset,len,vpkg_length);
			if (len > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) len = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
 
            		stream_read(demuxer->stream, dp_data+dp_hdr->len, len);
            		stream_read(demuxer->stream, dp_data+dp_hdr->len, len);
			if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
			if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
			dp_hdr->len+=len;
			dp_hdr->len+=len;
 Lines 992-997    Link Here  
		extra[0]=1; extra[1]=0; // offset of the first chunk
		extra[0]=1; extra[1]=0; // offset of the first chunk
		if(0x00==(vpkg_header&0xc0)){
		if(0x00==(vpkg_header&0xc0)){
		    // first fragment:
		    // first fragment:
		    if (len > dp->len - sizeof(dp_hdr_t)) len = dp->len - sizeof(dp_hdr_t);
 
		    dp_hdr->len=len;
		    dp_hdr->len=len;
		    stream_read(demuxer->stream, dp_data, len);
		    stream_read(demuxer->stream, dp_data, len);
		    ds->asf_packet=dp;
		    ds->asf_packet=dp;