From bc5c918ea8757514de0ec0327066251a2f1ec23f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 3 Oct 2008 10:16:29 +0000 Subject: 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 --- libavformat/mmf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libavformat/mmf.c') diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 3941bee14a..5e6d4ebccb 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -23,8 +23,8 @@ #include "riff.h" typedef struct { - offset_t atrpos, atsqpos, awapos; - offset_t data_size; + int64_t atrpos, atsqpos, awapos; + int64_t data_size; } MMFContext; static const int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 }; @@ -47,9 +47,9 @@ static int mmf_rate_code(int rate) } /* Copy of end_tag() from avienc.c, but for big-endian chunk size */ -static void end_tag_be(ByteIOContext *pb, offset_t start) +static void end_tag_be(ByteIOContext *pb, int64_t start) { - offset_t pos; + int64_t pos; pos = url_ftell(pb); url_fseek(pb, start - 4, SEEK_SET); @@ -61,7 +61,7 @@ static int mmf_write_header(AVFormatContext *s) { MMFContext *mmf = s->priv_data; ByteIOContext *pb = s->pb; - offset_t pos; + int64_t pos; int rate; rate = mmf_rate_code(s->streams[0]->codec->sample_rate); @@ -129,7 +129,7 @@ static int mmf_write_trailer(AVFormatContext *s) { ByteIOContext *pb = s->pb; MMFContext *mmf = s->priv_data; - offset_t pos, size; + int64_t pos, size; int gatetime; if (!url_is_streamed(s->pb)) { @@ -185,7 +185,7 @@ static int mmf_read_header(AVFormatContext *s, unsigned int tag; ByteIOContext *pb = s->pb; AVStream *st; - offset_t file_size, size; + int64_t file_size, size; int rate, params; tag = get_le32(pb); -- cgit v1.2.3