From a368db23438338672eafb38a0f4861a956f8d88f Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Fri, 13 Jul 2007 21:19:28 -0600 Subject: [PATCH] Compile fixes on OSX. --- src/matroska.c | 6 +++--- src/matroska.h | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/matroska.c b/src/matroska.c index 1fd5e3b..e1e4fa9 100644 --- a/src/matroska.c +++ b/src/matroska.c @@ -184,7 +184,7 @@ int mk_flushContextData(mk_Context *c) { return 0; } -int mk_closeContext(mk_Context *c, off_t *off) { +int mk_closeContext(mk_Context *c, int64_t *off) { if (c->id) { CHECK(mk_writeID(c->parent, c->id)); CHECK(mk_writeSize(c->parent, c->d_cur)); @@ -602,9 +602,9 @@ int mk_addFrameData(mk_Writer *w, mk_Track *track, const void *data, unsigned } /* The offset of the SeekHead is returned in *pointer. */ -int mk_writeSeek(mk_Writer *w, off_t *pointer) { +int mk_writeSeek(mk_Writer *w, int64_t *pointer) { mk_Context *c, *s; - off_t seekhead_ptr; + int64_t seekhead_ptr; if ((c = mk_createContext(w, w->root, 0x114d9b74)) == NULL) // SeekHead return -1; diff --git a/src/matroska.h b/src/matroska.h index 4aa2a7f..9fb13e5 100644 --- a/src/matroska.h +++ b/src/matroska.h @@ -46,9 +46,9 @@ struct mk_Context_s { struct mk_Writer_s { FILE *fp; - off_t duration_ptr; - off_t seekhead_ptr; - off_t segment_ptr; + int64_t duration_ptr; + int64_t seekhead_ptr; + int64_t segment_ptr; mk_Context *root; mk_Context *freelist; @@ -67,13 +67,13 @@ struct mk_Writer_s { mk_Track **tracks_arr; struct { - off_t segmentinfo; - off_t seekhead; - off_t tracks; - off_t cues; - off_t chapters; - off_t attachments; - off_t tags; + int64_t segmentinfo; + int64_t seekhead; + int64_t tracks; + int64_t cues; + int64_t chapters; + int64_t attachments; + int64_t tags; } seek_data; struct { @@ -121,8 +121,8 @@ int mk_writeFloat(mk_Context *c, unsigned id, float f); int mk_writeStr(mk_Context *c, unsigned id, const char *str); int mk_writeBin(mk_Context *c, unsigned id, const void *data, unsigned size); int mk_flushContextData(mk_Context *c); -int mk_closeContext(mk_Context *c, off_t *off); -int mk_writeSeek(mk_Writer *w, off_t *pointer); +int mk_closeContext(mk_Context *c, int64_t *off); +int mk_writeSeek(mk_Writer *w, int64_t *pointer); int mk_writeTracks(mk_Writer *w, mk_Context *tracks); int mk_writeChapters(mk_Writer *w); static unsigned mk_ebmlSizeSize(uint64_t s); -- 2.11.4.GIT