diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-03 18:05:21 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-03 18:05:21 +0300 |
| commit | e7a611de0058bb48bfe75dd86f28c9ea3f3288c5 (patch) | |
| tree | db4fb24cb498b179da366b0cf1d007e7513aa739 /libmpdemux | |
| parent | ebb4abf2081026c63bb5c983f76447d9d2413656 (diff) | |
| parent | bf0e018a68f2423bdb7cd2b9f1f297adb58c98d2 (diff) | |
| download | mpv-e7a611de0058bb48bfe75dd86f28c9ea3f3288c5.tar.bz2 mpv-e7a611de0058bb48bfe75dd86f28c9ea3f3288c5.tar.xz | |
Merge svn changes up to r27688
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 4 | ||||
| -rw-r--r-- | libmpdemux/muxer_lavf.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 641b7cf902..0e33e38d1c 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -92,9 +92,9 @@ static int mp_read(void *opaque, uint8_t *buf, int size) { return ret; } -static offset_t mp_seek(void *opaque, offset_t pos, int whence) { +static int64_t mp_seek(void *opaque, int64_t pos, int whence) { stream_t *stream = opaque; - offset_t current_pos; + int64_t current_pos; mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", stream, (int)pos, whence); if(whence == SEEK_CUR) pos +=stream_tell(stream); diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index fe7f5715fc..3cb536476b 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -73,7 +73,7 @@ static int mp_write(void *opaque, uint8_t *buf, int size) return stream_write_buffer(muxer->stream, buf, size); } -static offset_t mp_seek(void *opaque, offset_t pos, int whence) +static int64_t mp_seek(void *opaque, int64_t pos, int whence) { muxer_t *muxer = opaque; if(whence == SEEK_CUR) |