[MPlayer-cvslog] r27688 - in trunk/libmpdemux: demux_lavf.c muxer_lavf.c

gpoirier subversion at mplayerhq.hu
Fri Oct 3 16:54:22 CEST 2008


Author: gpoirier
Date: Fri Oct  3 16:54:22 2008
New Revision: 27688

Log:
fix compilation w/ FFmpeg r15533
patch by Andrew Wason %rectalogic A rectalogic P com%


Modified:
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/muxer_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	(original)
+++ trunk/libmpdemux/demux_lavf.c	Fri Oct  3 16:54:22 2008
@@ -94,9 +94,9 @@ static int mp_read(void *opaque, uint8_t
     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);

Modified: trunk/libmpdemux/muxer_lavf.c
==============================================================================
--- trunk/libmpdemux/muxer_lavf.c	(original)
+++ trunk/libmpdemux/muxer_lavf.c	Fri Oct  3 16:54:22 2008
@@ -73,7 +73,7 @@ static int mp_write(void *opaque, uint8_
 	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)



More information about the MPlayer-cvslog mailing list