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/utils.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/utils.c')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index f6101e33b4..1f1a174a04 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1701,7 +1701,7 @@ static void av_estimate_timings_from_bit_rate(AVFormatContext *ic) #define DURATION_MAX_READ_SIZE 250000 /* only usable for MPEG-PS streams */ -static void av_estimate_timings_from_pts(AVFormatContext *ic, offset_t old_offset) +static void av_estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) { AVPacket pkt1, *pkt = &pkt1; AVStream *st; @@ -1794,7 +1794,7 @@ static void av_estimate_timings_from_pts(AVFormatContext *ic, offset_t old_offse } } -static void av_estimate_timings(AVFormatContext *ic, offset_t old_offset) +static void av_estimate_timings(AVFormatContext *ic, int64_t old_offset) { int64_t file_size; @@ -2003,7 +2003,7 @@ int av_find_stream_info(AVFormatContext *ic) int64_t last_dts[MAX_STREAMS]; int duration_count[MAX_STREAMS]={0}; double (*duration_error)[MAX_STD_TIMEBASES]; - offset_t old_offset = url_ftell(ic->pb); + int64_t old_offset = url_ftell(ic->pb); int64_t codec_info_duration[MAX_STREAMS]={0}; int codec_info_nb_frames[MAX_STREAMS]={0}; |