Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
5aa03f37
Commit
5aa03f37
authored
Dec 25, 2014
by
François Cartegnie
🤞
Browse files
demux: mkv: don't seek on current pos
parent
a4ff1de2
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/demux/mkv/stream_io_callback.cpp
View file @
5aa03f37
...
@@ -47,6 +47,7 @@ uint32 vlc_stream_io_callback::read( void *p_buffer, size_t i_size )
...
@@ -47,6 +47,7 @@ uint32 vlc_stream_io_callback::read( void *p_buffer, size_t i_size )
void
vlc_stream_io_callback
::
setFilePointer
(
int64_t
i_offset
,
seek_mode
mode
)
void
vlc_stream_io_callback
::
setFilePointer
(
int64_t
i_offset
,
seek_mode
mode
)
{
{
int64_t
i_pos
,
i_size
;
int64_t
i_pos
,
i_size
;
int64_t
i_current
=
stream_Tell
(
s
);
switch
(
mode
)
switch
(
mode
)
{
{
...
@@ -57,10 +58,13 @@ void vlc_stream_io_callback::setFilePointer(int64_t i_offset, seek_mode mode )
...
@@ -57,10 +58,13 @@ void vlc_stream_io_callback::setFilePointer(int64_t i_offset, seek_mode mode )
i_pos
=
stream_Size
(
s
)
-
i_offset
;
i_pos
=
stream_Size
(
s
)
-
i_offset
;
break
;
break
;
default:
default:
i_pos
=
stream_Tell
(
s
)
+
i_offset
;
i_pos
=
i_current
+
i_offset
;
break
;
break
;
}
}
if
(
i_pos
==
i_current
)
return
;
if
(
i_pos
<
0
||
(
(
i_size
=
stream_Size
(
s
)
)
!=
0
&&
i_pos
>=
i_size
)
)
if
(
i_pos
<
0
||
(
(
i_size
=
stream_Size
(
s
)
)
!=
0
&&
i_pos
>=
i_size
)
)
{
{
mb_eof
=
true
;
mb_eof
=
true
;
...
...
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