Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 35266:ceb148e1fe31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change STREAM_CTRL_GET_SIZE argument type from off_t to uint64_t. Also fix the incorrect type of the uint64_res variable.
author reimar
date Tue, 06 Nov 2012 17:31:23 +0000
parents 60c7713b1061
children 5e22bb28e6b7
comparison
equal deleted inserted replaced
35265:54a706166f5d 35266:ceb148e1fe31
104 else if(whence == SEEK_END && stream->end_pos > 0) 104 else if(whence == SEEK_END && stream->end_pos > 0)
105 pos += stream->end_pos; 105 pos += stream->end_pos;
106 else if(whence == SEEK_SET) 106 else if(whence == SEEK_SET)
107 pos += stream->start_pos; 107 pos += stream->start_pos;
108 else if(whence == AVSEEK_SIZE && stream->end_pos > 0) { 108 else if(whence == AVSEEK_SIZE && stream->end_pos > 0) {
109 off_t size; 109 uint64_t size;
110 stream_control(stream, STREAM_CTRL_GET_SIZE, &size); 110 stream_control(stream, STREAM_CTRL_GET_SIZE, &size);
111 if (size > stream->end_pos) 111 if (size > stream->end_pos)
112 stream->end_pos = size; 112 stream->end_pos = size;
113 return stream->end_pos - stream->start_pos; 113 return stream->end_pos - stream->start_pos;
114 } else 114 } else