Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
7076fe3a
Commit
7076fe3a
authored
Jun 06, 2008
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "stream_Read() : makes the buffer mandatory"
This reverts commit
0bcda15e
.
parent
b1285bea
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
src/input/stream.c
src/input/stream.c
+10
-6
No files found.
src/input/stream.c
View file @
7076fe3a
...
...
@@ -804,10 +804,13 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read )
int
i_copy
=
__MIN
(
i_current
,
i_read
-
i_data
);
/* Copy data */
memcpy
(
p_data
,
if
(
p_data
)
{
memcpy
(
p_data
,
&
p_sys
->
block
.
p_current
->
p_buffer
[
p_sys
->
block
.
i_offset
],
i_copy
);
p_data
+=
i_copy
;
p_data
+=
i_copy
;
}
i_data
+=
i_copy
;
p_sys
->
block
.
i_offset
+=
i_copy
;
...
...
@@ -1145,8 +1148,11 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read )
/* Copy data */
/* msg_Dbg( s, "AStreamReadStream: copy %d", i_copy ); */
memcpy
(
p_data
,
&
tk
->
p_buffer
[
i_off
],
i_copy
);
p_data
+=
i_copy
;
if
(
p_data
)
{
memcpy
(
p_data
,
&
tk
->
p_buffer
[
i_off
],
i_copy
);
p_data
+=
i_copy
;
}
i_data
+=
i_copy
;
p_sys
->
stream
.
i_offset
+=
i_copy
;
...
...
@@ -2068,8 +2074,6 @@ static int ASeek( stream_t *s, int64_t i_pos )
*/
int
stream_Read
(
stream_t
*
s
,
void
*
p_read
,
int
i_read
)
{
assert
(
s
);
assert
(
p_read
);
return
s
->
pf_read
(
s
,
p_read
,
i_read
);
}
...
...
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