Diff of /trunk/mplayer/patches/mplayer-1.0_rc2-demux_mov_fix_20080129.patch

Parent Directory | Revision Log | Patch

	revision 462 by niro, Tue Feb 5 15:43:17 2008 UTC	revision 463 by niro, Tue Feb 5 16:48:20 2008 UTC
#	Line 1	Line 1
1	--- trunk/libmpdemux/demux_mov.c 2008/01/29 22:13:20 25920	Index: demux_mov.c
2	+++ trunk/libmpdemux/demux_mov.c 2008/01/29 22:14:00 25922	===================================================================
3	@@ -175,11 +175,12 @@	--- demux_mov.c (revision 24724)
4		+++ demux_mov.c (working copy)
5		@@ -173,11 +173,12 @@
6	i=trak->chunkmap_size;	i=trak->chunkmap_size;
7	while(i>0){	while(i>0){
8	--i;	--i;
#	Line 15	Line 17
17	}	}
18
19	#if 0	#if 0
20	@@ -237,6 +238,8 @@	@@ -235,6 +236,8 @@
21	s=0;	s=0;
22	for(j=0;j<trak->durmap_size;j++){	for(j=0;j<trak->durmap_size;j++){
23	for(i=0;i<trak->durmap[j].num;i++){	for(i=0;i<trak->durmap[j].num;i++){
#	Line 24	Line 26
26	trak->samples[s].pts=pts;	trak->samples[s].pts=pts;
27	++s;	++s;
28	pts+=trak->durmap[j].dur;	pts+=trak->durmap[j].dur;
29	@@ -248,6 +251,8 @@	@@ -246,6 +249,8 @@
30	for(j=0;j<trak->chunks_size;j++){	for(j=0;j<trak->chunks_size;j++){
31	off_t pos=trak->chunks[j].pos;	off_t pos=trak->chunks[j].pos;
32	for(i=0;i<trak->chunks[j].size;i++){	for(i=0;i<trak->chunks[j].size;i++){
#	Line 33	Line 35
35	trak->samples[s].pos=pos;	trak->samples[s].pos=pos;
36	mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d  off=0x%08X  size=%d\n",s,	mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d  off=0x%08X  size=%d\n",s,
37	trak->samples[s].pts,	trak->samples[s].pts,
38		@@ -1568,8 +1573,7 @@
39		if( udta_len>udta_size)
40		udta_len=udta_size;
41		{
42		- char dump[udta_len-4];
43		- stream_read(demuxer->stream, (char *)&dump, udta_len-4-4);
44		+ stream_skip(demuxer->stream, udta_len-4-4);
45		udta_size -= udta_len;
46		}
47		}

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.462   changed lines   Added in v.463