diff options
| author | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-03 14:54:22 +0000 |
|---|---|---|
| committer | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-03 14:54:22 +0000 |
| commit | bf0e018a68f2423bdb7cd2b9f1f297adb58c98d2 (patch) | |
| tree | 6ea47bbc23c80856fe98a12c4b5149aba7f2f521 /libmpdemux | |
| parent | e965e2943242c8f121e04828173b9a78eb861d01 (diff) | |
| download | mpv-bf0e018a68f2423bdb7cd2b9f1f297adb58c98d2.tar.bz2 mpv-bf0e018a68f2423bdb7cd2b9f1f297adb58c98d2.tar.xz | |
fix compilation w/ FFmpeg r15533
patch by Andrew Wason %rectalogic A rectalogic P com%
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27688 b3059339-0415-0410-9bf9-f77b7e298cf2
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 062cad7f98..a0dfde924e 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -94,9 +94,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) |