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/mp3.c | |
| parent | 0c45cd0720cdf2415a93ef63475690faf68364c2 (diff) | |
| download | ffmpeg-bc5c918ea8757514de0ec0327066251a2f1ec23f.tar.gz | |
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/mp3.c')
| -rw-r--r-- | libavformat/mp3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index efe494402b..407d4f00d7 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -224,7 +224,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t fl { int isv34, tlen; uint32_t tag; - offset_t next; + int64_t next; char tmp[16]; int taghdrlen; const char *reason; @@ -402,11 +402,11 @@ static int mp3_read_probe(AVProbeData *p) /** * Try to find Xing/Info/VBRI tags and compute duration from info therein */ -static void mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, offset_t base) +static void mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base) { uint32_t v, spf; int frames = -1; /* Total number of frames in file */ - const offset_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; + const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; MPADecodeContext c; v = get_be32(s->pb); @@ -452,7 +452,7 @@ static int mp3_read_header(AVFormatContext *s, AVStream *st; uint8_t buf[ID3v1_TAG_SIZE]; int len, ret, filesize; - offset_t off; + int64_t off; st = av_new_stream(s, 0); if (!st) |