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 | |
parent | 456cac925b1ef4dc2e1434bc7580858a315d489c (diff) | |
download | asb-9360bb6dffa297240c59ccb5dcefbc32627b4f46.tar.gz asb-9360bb6dffa297240c59ccb5dcefbc32627b4f46.tar.xz |
Initial revision
-rw-r--r-- | MPlayer/build/demux_audio_fix_20080129.diff | 13 | ||||
-rw-r--r-- | MPlayer/build/demux_mov_fix_20080129.diff | 47 | ||||
-rw-r--r-- | MPlayer/build/stream_cddb_fix_20080120.diff | 34 | ||||
-rw-r--r-- | MPlayer/build/url_fix_20080120.diff | 12 |
4 files changed, 106 insertions, 0 deletions
diff --git a/MPlayer/build/demux_audio_fix_20080129.diff b/MPlayer/build/demux_audio_fix_20080129.diff new file mode 100644 index 00000000..dca4704c --- /dev/null +++ b/MPlayer/build/demux_audio_fix_20080129.diff @@ -0,0 +1,13 @@ +Index: demux_audio.c +=================================================================== +--- demux_audio.c (revision 24724) ++++ demux_audio.c (working copy) +@@ -229,6 +229,8 @@ + ptr += 4; + + comment = ptr; ++ if (&comment[length] < comments || &comment[length] >= &comments[blk_len]) ++ return; + c = comment[length]; + comment[length] = 0; + 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; + } + } diff --git a/MPlayer/build/stream_cddb_fix_20080120.diff b/MPlayer/build/stream_cddb_fix_20080120.diff new file mode 100644 index 00000000..d08afef1 --- /dev/null +++ b/MPlayer/build/stream_cddb_fix_20080120.diff @@ -0,0 +1,34 @@ +Index: stream_cddb.c +=================================================================== +--- stream_cddb.c (revision 24724) ++++ stream_cddb.c (working copy) +@@ -53,6 +53,7 @@ + #include "version.h" + #include "stream.h" + #include "network.h" ++#include "libavutil/intreadwrite.h" + + #define DEFAULT_FREEDB_SERVER "freedb.freedb.org" + #define DEFAULT_CACHE_DIR "/.cddb/" +@@ -453,8 +454,9 @@ + } else { + len = ptr2-ptr+1; + } ++ len = FFMIN(sizeof(album_title) - 1, len); + strncpy(album_title, ptr, len); +- album_title[len-2]='\0'; ++ album_title[len]='\0'; + } + mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title); + return 0; +@@ -490,8 +492,9 @@ + } else { + len = ptr2-ptr+1; + } ++ len = FFMIN(sizeof(album_title) - 1, len); + strncpy(album_title, ptr, len); +- album_title[len-2]='\0'; ++ album_title[len]='\0'; + } + mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title); + return cddb_request_titles(cddb_data); diff --git a/MPlayer/build/url_fix_20080120.diff b/MPlayer/build/url_fix_20080120.diff new file mode 100644 index 00000000..43b1fdd0 --- /dev/null +++ b/MPlayer/build/url_fix_20080120.diff @@ -0,0 +1,12 @@ +Index: url.c +=================================================================== +--- url.c (revision 24724) ++++ url.c (working copy) +@@ -328,6 +328,7 @@ + } + } + ++ tmp = NULL; + while(i < len) { + // look for the next char that must be kept + for (j=i;j<len;j++) { |