diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-10-03 10:16:29 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-10-03 10:16:29 +0000 |
| commit | bc5c918ea8757514de0ec0327066251a2f1ec23f (patch) | |
| tree | 81bdb2bd95adf7002bc895eec401c7badf36816e /libavformat/avidec.c | |
| parent | 0c45cd0720cdf2415a93ef63475690faf68364c2 (diff) | |
Remove offset_t typedef and use int64_t directly instead.
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.
Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index b4494f7fbd..c9c27e262d 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -51,7 +51,7 @@ typedef struct { int64_t riff_end; int64_t movi_end; int64_t fsize; - offset_t movi_list; + int64_t movi_list; int index_loaded; int is_odml; int non_interleaved; @@ -217,7 +217,7 @@ static void clean_index(AVFormatContext *s){ static int avi_read_tag(ByteIOContext *pb, char *buf, int maxlen, unsigned int size) { - offset_t i = url_ftell(pb); + int64_t i = url_ftell(pb); size += (size & 1); get_strz(pb, buf, maxlen); url_fseek(pb, i+size, SEEK_SET); @@ -619,7 +619,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) AVIContext *avi = s->priv_data; ByteIOContext *pb = s->pb; int n, d[8], size; - offset_t i, sync; + int64_t i, sync; void* dstr; if (ENABLE_DV_DEMUXER && avi->dv_demux) { @@ -937,7 +937,7 @@ static int avi_load_index(AVFormatContext *s) AVIContext *avi = s->priv_data; ByteIOContext *pb = s->pb; uint32_t tag, size; - offset_t pos= url_ftell(pb); + int64_t pos= url_ftell(pb); url_fseek(pb, avi->movi_end, SEEK_SET); #ifdef DEBUG_SEEK |