Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
4c4e7156
Commit
4c4e7156
authored
Oct 04, 2008
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg changed offset_t to int64_t in svn rev15533. Let's keep up with them.
Manually backported from
e642dc37
parent
f910b498
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
modules/demux/avformat/demux.c
modules/demux/avformat/demux.c
+3
-3
modules/demux/avformat/mux.c
modules/demux/avformat/mux.c
+3
-3
No files found.
modules/demux/avformat/demux.c
View file @
4c4e7156
...
@@ -84,7 +84,7 @@ static int Demux ( demux_t *p_demux );
...
@@ -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
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
);
/*****************************************************************************
/*****************************************************************************
* Open
* Open
...
@@ -170,7 +170,7 @@ int OpenDemux( vlc_object_t *p_this )
...
@@ -170,7 +170,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
,
...
@@ -493,7 +493,7 @@ static int IORead( void *opaque, uint8_t *buf, int buf_size )
...
@@ -493,7 +493,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
;
...
...
modules/demux/avformat/mux.c
View file @
4c4e7156
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment