diff options
| author |   Eric Hameleers <alien@slackware.com> | 2008-02-01 20:17:29 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2008-02-01 20:17:29 +0000 |
| commit | 9360bb6dffa297240c59ccb5dcefbc32627b4f46 (patch) | |
| tree | 4103a0129c46014074ab69224f0dfa81fd2b13ac /MPlayer/build/demux_mov_fix_20080129.diff | |
| parent | 456cac925b1ef4dc2e1434bc7580858a315d489c (diff) | |
| download | asb-9360bb6dffa297240c59ccb5dcefbc32627b4f46.tar.gz asb-9360bb6dffa297240c59ccb5dcefbc32627b4f46.tar.xz | |
Initial revision
Diffstat (limited to 'MPlayer/build/demux_mov_fix_20080129.diff')
| -rw-r--r-- | MPlayer/build/demux_mov_fix_20080129.diff | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/MPlayer/build/demux_mov_fix_20080129.diff b/MPlayer/build/demux_mov_fix_20080129.diff new file mode 100644 index 00000000..a4d793e5 --- /dev/null +++ b/MPlayer/build/demux_mov_fix_20080129.diff @@ -0,0 +1,47 @@ +Index: demux_mov.c +=================================================================== +--- demux_mov.c (revision 24724) ++++ demux_mov.c (working copy) +@@ -173,11 +173,12 @@ + i=trak->chunkmap_size; + while(i>0){ + --i; +- for(j=trak->chunkmap[i].first;j<last;j++){ ++ j=FFMAX(trak->chunkmap[i].first, 0); ++ for(;j<last;j++){ + trak->chunks[j].desc=trak->chunkmap[i].sdid; + trak->chunks[j].size=trak->chunkmap[i].spc; + } +- last=trak->chunkmap[i].first; ++ last=FFMIN(trak->chunkmap[i].first, trak->chunks_size); + } + + #if 0 +@@ -235,6 +236,8 @@ + s=0; + for(j=0;j<trak->durmap_size;j++){ + for(i=0;i<trak->durmap[j].num;i++){ ++ if (s >= trak->samples_size) ++ break; + trak->samples[s].pts=pts; + ++s; + pts+=trak->durmap[j].dur; +@@ -246,6 +249,8 @@ + for(j=0;j<trak->chunks_size;j++){ + off_t pos=trak->chunks[j].pos; + for(i=0;i<trak->chunks[j].size;i++){ ++ if (s >= trak->samples_size) ++ break; + trak->samples[s].pos=pos; + mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d off=0x%08X size=%d\n",s, + trak->samples[s].pts, +@@ -1568,8 +1573,7 @@ + if( udta_len>udta_size) + udta_len=udta_size; + { +- char dump[udta_len-4]; +- stream_read(demuxer->stream, (char *)&dump, udta_len-4-4); ++ stream_skip(demuxer->stream, udta_len-4-4); + udta_size -= udta_len; + } + } |