Mercurial > mplayer.hg

changeset 27656:3029d0e351a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compilation w/ FFmpeg r15533 patch by Andrew Wason %rectalogic A rectalogic P com%
author gpoirier
date Fri, 03 Oct 2008 14:54:22 +0000
parents 710704af0926
children 6a1e2da86344
files libmpdemux/demux_lavf.c libmpdemux/muxer_lavf.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Fri Oct 03 10:18:53 2008 +0000
+++ b/libmpdemux/demux_lavf.c	Fri Oct 03 14:54:22 2008 +0000
@@ -94,9 +94,9 @@
     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);
--- a/libmpdemux/muxer_lavf.c	Fri Oct 03 10:18:53 2008 +0000
+++ b/libmpdemux/muxer_lavf.c	Fri Oct 03 14:54:22 2008 +0000
@@ -73,7 +73,7 @@
 	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)