Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
0bcda15e
Commit
0bcda15e
authored
Jun 06, 2008
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stream_Read() : makes the buffer mandatory
parent
8e95f585
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
src/input/stream.c
src/input/stream.c
+6
-10
No files found.
src/input/stream.c
View file @
0bcda15e
...
...
@@ -804,13 +804,10 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read )
int
i_copy
=
__MIN
(
i_current
,
i_read
-
i_data
);
/* Copy data */
if
(
p_data
)
{
memcpy
(
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
;
...
...
@@ -1148,11 +1145,8 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read )
/* Copy data */
/* msg_Dbg( s, "AStreamReadStream: copy %d", i_copy ); */
if
(
p_data
)
{
memcpy
(
p_data
,
&
tk
->
p_buffer
[
i_off
],
i_copy
);
p_data
+=
i_copy
;
}
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
;
...
...
@@ -2074,6 +2068,8 @@ 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