diff options
| author | James Meyer <james.meyer@operamail.com> | 2008-10-28 21:09:28 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2008-10-28 21:09:28 (GMT) |
| commit | c848d1b444b9e03f047830c04f5e1e70183035e9 (patch) | |
| tree | ff2e83339e0a73ad89a29c4f339045fb7c054952 /abs/extra-testing/mplayer/demux_mov_fix_20080129.diff | |
| parent | c1381a8b3a355c57fca1ce2bfad0e3bf3e32b4ba (diff) | |
| download | linhes_pkgbuild-c848d1b444b9e03f047830c04f5e1e70183035e9.zip linhes_pkgbuild-c848d1b444b9e03f047830c04f5e1e70183035e9.tar.gz linhes_pkgbuild-c848d1b444b9e03f047830c04f5e1e70183035e9.tar.bz2 | |
move mplayer to testing
Diffstat (limited to 'abs/extra-testing/mplayer/demux_mov_fix_20080129.diff')
| -rw-r--r-- | abs/extra-testing/mplayer/demux_mov_fix_20080129.diff | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/abs/extra-testing/mplayer/demux_mov_fix_20080129.diff b/abs/extra-testing/mplayer/demux_mov_fix_20080129.diff new file mode 100644 index 0000000..d83477b --- /dev/null +++ b/abs/extra-testing/mplayer/demux_mov_fix_20080129.diff @@ -0,0 +1,45 @@ +--- libmpdemux/demux_mov.c (revision 24724) ++++ libmpdemux/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; + } + } |