diff options
author | wm4 <wm4@nowhere> | 2012-11-18 20:46:12 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-20 18:00:15 +0100 |
commit | ddffcce67810fbde5508a353f85760da7a1b4a95 (patch) | |
tree | 74d9b416568c12759a0c198651bce0e78a0c2284 /demux/aviheader.c | |
parent | 51dac4e0702e361b88e5a373fbb0165f5ad47420 (diff) | |
download | mpv-ddffcce67810fbde5508a353f85760da7a1b4a95.tar.bz2 mpv-ddffcce67810fbde5508a353f85760da7a1b4a95.tar.xz |
stream, demux: replace off_t with int64_t
On reasonable systems, these types were the same anyway. Even on
unreasonable systems (seriously, which?), this may reduce potential
breakage.
Diffstat (limited to 'demux/aviheader.c')
-rw-r--r-- | demux/aviheader.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/demux/aviheader.c b/demux/aviheader.c index a83ce1e0fb..7bf1803799 100644 --- a/demux/aviheader.c +++ b/demux/aviheader.c @@ -49,8 +49,8 @@ static int odml_get_vstream_id(int id, unsigned char res[]) static int avi_idx_cmp(const void *elem1, const void *elem2) { - register off_t a = AVI_IDX_OFFSET((AVIINDEXENTRY *)elem1); - register off_t b = AVI_IDX_OFFSET((AVIINDEXENTRY *)elem2); + register int64_t a = AVI_IDX_OFFSET((AVIINDEXENTRY *)elem1); + register int64_t b = AVI_IDX_OFFSET((AVIINDEXENTRY *)elem2); return (a > b) - (b > a); } @@ -61,7 +61,7 @@ int stream_id=-1; int idxfix_videostream=0; int idxfix_divx=0; avi_priv_t* priv=demuxer->priv; -off_t list_end=0; +int64_t list_end=0; //---- AVI header: priv->idx_size=0; @@ -480,7 +480,7 @@ if (priv->isodml && (index_mode==-1 || index_mode==0 || index_mode==1)) { for (j=0; j<cx->nEntriesInUse; j++) { int ret1, ret2; memset(&cx->stdidx[j], 0, 32); - ret1 = stream_seek(demuxer->stream, (off_t)cx->aIndex[j].qwOffset); + ret1 = stream_seek(demuxer->stream, (int64_t)cx->aIndex[j].qwOffset); ret2 = stream_read(demuxer->stream, (char *)&cx->stdidx[j], 32); if (ret1 != 1 || ret2 != 32 || cx->stdidx[j].nEntriesInUse==0) { // this is a broken file (probably incomplete) let the standard @@ -596,7 +596,7 @@ if(index_mode>=2 || (priv->idx_size==0 && index_mode==1)){ while(1){ int id; unsigned len; - off_t skip; + int64_t skip; AVIINDEXENTRY* idx; unsigned int c; demuxer->filepos=stream_tell(demuxer->stream); @@ -638,9 +638,9 @@ if(index_mode>=2 || (priv->idx_size==0 && index_mode==1)){ } // update status line: - { static off_t lastpos; - off_t pos; - off_t len=demuxer->movi_end-demuxer->movi_start; + { static int64_t lastpos; + int64_t pos; + int64_t len=demuxer->movi_end-demuxer->movi_start; if(len){ pos=100*(demuxer->filepos-demuxer->movi_start)/len; // % } else { |