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
This commit is contained in:
@@ -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};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user