[vlc-devel] commit: ffmpeg changed offset_t to int64_t in svn rev15533. Let' s keep up with them. (Christophe Mutricy )

[git version control]

vlc | branch: 0.9-bugfix | Christophe Mutricy <xtophe at videolan.org> | Sat Oct  4 19:48:17 2008 +0100| [4c4e71563127304c8f610c8f9dd082d7522305e1] | committer: Christophe Mutricy 

ffmpeg changed offset_t to int64_t in svn rev15533. Let's keep up with them.

Manually backported from e642dc37f2a45f193998d776439664a5a139b9e0

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c4e71563127304c8f610c8f9dd082d7522305e1
---

 modules/demux/avformat/demux.c |    6 +++---
 modules/demux/avformat/mux.c   |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 11bea18..0fc2301 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -84,7 +84,7 @@ static int Demux  ( demux_t *p_demux );
 static int Control( demux_t *p_demux, int i_query, va_list args );
 
 static int IORead( void *opaque, uint8_t *buf, int buf_size );
-static offset_t IOSeek( void *opaque, offset_t offset, int whence );
+static int64_t IOSeek( void *opaque, int64_t offset, int whence );
 
 /*****************************************************************************
  * Open
@@ -170,7 +170,7 @@ int OpenDemux( vlc_object_t *p_this )
                     (int (*) (URLContext *, unsigned char *, int))IORead;
     p_sys->url.prot->url_write = 0;
     p_sys->url.prot->url_seek =
-                    (offset_t (*) (URLContext *, offset_t, int))IOSeek;
+                    (int64_t (*) (URLContext *, int64_t, int))IOSeek;
     p_sys->url.prot->url_close = 0;
     p_sys->url.prot->next = 0;
     init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
@@ -493,7 +493,7 @@ static int IORead( void *opaque, uint8_t *buf, int buf_size )
     return i_ret ? i_ret : -1;
 }
 
-static offset_t IOSeek( void *opaque, offset_t offset, int whence )
+static int64_t IOSeek( void *opaque, int64_t offset, int whence )
 {
     URLContext *p_url = opaque;
     demux_t *p_demux = p_url->priv_data;
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 14b19ce..5853db7 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -78,7 +78,7 @@ static int DelStream( sout_mux_t *, sout_input_t * );
 static int Mux      ( sout_mux_t * );
 
 static int IOWrite( void *opaque, uint8_t *buf, int buf_size );
-static offset_t IOSeek( void *opaque, offset_t offset, int whence );
+static int64_t IOSeek( void *opaque, int64_t offset, int whence );
 
 /*****************************************************************************
  * Open
@@ -135,7 +135,7 @@ int OpenMux( vlc_object_t *p_this )
     p_sys->url.prot->url_write =
                     (int (*) (URLContext *, unsigned char *, int))IOWrite;
     p_sys->url.prot->url_seek =
-                    (offset_t (*) (URLContext *, offset_t, int))IOSeek;
+                    (int64_t (*) (URLContext *, int64_t, int))IOSeek;
     p_sys->url.prot->url_close = 0;
     p_sys->url.prot->next = 0;
     init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
@@ -475,7 +475,7 @@ static int IOWrite( void *opaque, uint8_t *buf, int buf_size )
     return i_ret ? i_ret : -1;
 }
 
-static offset_t IOSeek( void *opaque, offset_t offset, int whence )
+static int64_t IOSeek( void *opaque, int64_t offset, int whence )
 {
     URLContext *p_url = opaque;
     sout_mux_t *p_mux = p_url->priv_data;