diff options
| author | wm4 <wm4@nowhere> | 2012-11-18 20:46:12 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-20 18:00:15 +0100 |
| commit | ddffcce67810fbde5508a353f85760da7a1b4a95 (patch) | |
| tree | 74d9b416568c12759a0c198651bce0e78a0c2284 /demux/demux_mpg.c | |
| parent | 51dac4e0702e361b88e5a373fbb0165f5ad47420 (diff) | |
| download | mpv-ddffcce67810fbde5508a353f85760da7a1b4a95.tar.bz2 mpv-ddffcce67810fbde5508a353f85760da7a1b4a95.tar.xz | |
stream, demux: replace off_t with int64_t
On reasonable systems, these types were the same anyway. Even on
unreasonable systems (seriously, which?), this may reduce potential
breakage.
Diffstat (limited to 'demux/demux_mpg.c')
| -rw-r--r-- | demux/demux_mpg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/demux/demux_mpg.c b/demux/demux_mpg.c index 7c943a87b1..92d6290ab0 100644 --- a/demux/demux_mpg.c +++ b/demux/demux_mpg.c @@ -61,7 +61,7 @@ typedef struct mpg_demuxer { } mpg_demuxer_t; static int mpeg_pts_error=0; -off_t ps_probe = 0; +int64_t ps_probe = 0; static int parse_psm(demuxer_t *demux, int len) { unsigned char c, id, type; @@ -134,7 +134,7 @@ static int parse_psm(demuxer_t *demux, int len) { //returns the first pts found within TIME_STAMP_PROBE_LEN bytes after stream_pos in demuxer's stream. //if no pts is found or an error occurs, -1.0 is returned. //Packs are freed. -static float read_first_mpeg_pts_at_position(demuxer_t* demuxer, off_t stream_pos) +static float read_first_mpeg_pts_at_position(demuxer_t* demuxer, int64_t stream_pos) { stream_t *s = demuxer->stream; mpg_demuxer_t *mpg_d = demuxer->priv; @@ -210,7 +210,7 @@ static demuxer_t* demux_mpg_open(demuxer_t* demuxer) { //of the stream //The position where the stream is now - off_t pos = stream_tell(s); + int64_t pos = stream_tell(s); float first_pts = read_first_mpeg_pts_at_position(demuxer, demuxer->movi_start); if(first_pts != -1.0) { @@ -450,7 +450,7 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){ //============== DVD Audio sub-stream ====================== if(id==0x1BD){ int aid, rawa52 = 0; - off_t tmppos; + int64_t tmppos; unsigned int tmp; tmppos = stream_tell(demux->stream); @@ -674,7 +674,7 @@ static inline void update_stats(int head) static int demux_mpg_probe(demuxer_t *demuxer) { int pes av_unused = 1; int tmp; - off_t tmppos; + int64_t tmppos; int file_format = DEMUXER_TYPE_UNKNOWN; tmppos=stream_tell(demuxer->stream); @@ -910,9 +910,9 @@ static void demux_seek_mpg(demuxer_t *demuxer, float rel_seek_secs, mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv; int precision = 1; float oldpts = 0; - off_t oldpos = demuxer->filepos; + int64_t oldpos = demuxer->filepos; float newpts = 0; - off_t newpos = (flags & SEEK_ABSOLUTE) ? demuxer->movi_start : oldpos; + int64_t newpos = (flags & SEEK_ABSOLUTE) ? demuxer->movi_start : oldpos; if(mpg_d) oldpts = mpg_d->last_pts; @@ -1114,7 +1114,7 @@ static demuxer_t* demux_mpg_ps_open(demuxer_t* demuxer) if(!sh_video->format && ps_probe > 0) { int head; - off_t pos = stream_tell(demuxer->stream); + int64_t pos = stream_tell(demuxer->stream); clear_stats(); do { |