Commit e642dc37 authored by Dominique Leuenberger's avatar Dominique Leuenberger Committed by Christophe Mutricy

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

Signed-Off-By: Christophe Mutricy
parent 9507a480
...@@ -96,7 +96,7 @@ static int Demux ( demux_t *p_demux ); ...@@ -96,7 +96,7 @@ static int Demux ( demux_t *p_demux );
static int Control( demux_t *p_demux, int i_query, va_list args ); 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 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 );
static void UpdateSeekPoint( demux_t *p_demux, int64_t i_time ); static void UpdateSeekPoint( demux_t *p_demux, int64_t i_time );
...@@ -187,7 +187,7 @@ int OpenDemux( vlc_object_t *p_this ) ...@@ -187,7 +187,7 @@ int OpenDemux( vlc_object_t *p_this )
(int (*) (URLContext *, unsigned char *, int))IORead; (int (*) (URLContext *, unsigned char *, int))IORead;
p_sys->url.prot->url_write = 0; p_sys->url.prot->url_write = 0;
p_sys->url.prot->url_seek = 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->url_close = 0;
p_sys->url.prot->next = 0; p_sys->url.prot->next = 0;
init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size, init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
...@@ -650,7 +650,7 @@ static int IORead( void *opaque, uint8_t *buf, int buf_size ) ...@@ -650,7 +650,7 @@ static int IORead( void *opaque, uint8_t *buf, int buf_size )
return i_ret ? i_ret : -1; 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; URLContext *p_url = opaque;
demux_t *p_demux = p_url->priv_data; demux_t *p_demux = p_url->priv_data;
......
...@@ -78,7 +78,7 @@ static int DelStream( sout_mux_t *, sout_input_t * ); ...@@ -78,7 +78,7 @@ static int DelStream( sout_mux_t *, sout_input_t * );
static int Mux ( sout_mux_t * ); static int Mux ( sout_mux_t * );
static int IOWrite( void *opaque, uint8_t *buf, int buf_size ); 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 * Open
...@@ -135,7 +135,7 @@ int OpenMux( vlc_object_t *p_this ) ...@@ -135,7 +135,7 @@ int OpenMux( vlc_object_t *p_this )
p_sys->url.prot->url_write = p_sys->url.prot->url_write =
(int (*) (URLContext *, unsigned char *, int))IOWrite; (int (*) (URLContext *, unsigned char *, int))IOWrite;
p_sys->url.prot->url_seek = 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->url_close = 0;
p_sys->url.prot->next = 0; p_sys->url.prot->next = 0;
init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size, 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 ) ...@@ -475,7 +475,7 @@ static int IOWrite( void *opaque, uint8_t *buf, int buf_size )
return i_ret ? i_ret : -1; 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; URLContext *p_url = opaque;
sout_mux_t *p_mux = p_url->priv_data; sout_mux_t *p_mux = p_url->priv_data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment