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
01a24c0a
Commit
01a24c0a
authored
Jun 06, 2008
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "ASF: Do not use stream_Read with a NULL buffer"
This reverts commit
77a7babe
.
parent
77a7babe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+2
-3
modules/demux/asf/libasf.c
modules/demux/asf/libasf.c
+1
-1
No files found.
modules/demux/asf/asf.c
View file @
01a24c0a
...
@@ -637,9 +637,8 @@ static int DemuxPacket( demux_t *p_demux )
...
@@ -637,9 +637,8 @@ static int DemuxPacket( demux_t *p_demux )
msg_Warn
(
p_demux
,
"Read %d too much bytes in the packet"
,
msg_Warn
(
p_demux
,
"Read %d too much bytes in the packet"
,
i_packet_padding_length
-
i_packet_size_left
);
i_packet_padding_length
-
i_packet_size_left
);
#endif
#endif
if
(
stream_Seek
(
p_demux
->
s
,
if
(
stream_Read
(
p_demux
->
s
,
NULL
,
i_packet_size_left
)
stream_Tell
(
p_demux
->
s
)
+
i_packet_size_left
)
<
i_packet_size_left
)
!=
VLC_SUCCESS
)
{
{
msg_Err
(
p_demux
,
"cannot skip data, EOF ?"
);
msg_Err
(
p_demux
,
"cannot skip data, EOF ?"
);
return
0
;
return
0
;
...
...
modules/demux/asf/libasf.c
View file @
01a24c0a
...
@@ -479,7 +479,7 @@ static int ASF_ReadObject_header_extension( stream_t *s, asf_object_t *p_obj )
...
@@ -479,7 +479,7 @@ static int ASF_ReadObject_header_extension( stream_t *s, asf_object_t *p_obj )
if
(
!
p_he
->
i_header_extension_size
)
return
VLC_SUCCESS
;
if
(
!
p_he
->
i_header_extension_size
)
return
VLC_SUCCESS
;
/* Read the extension objects */
/* Read the extension objects */
stream_
Seek
(
s
,
stream_Tell
(
s
)
+
46
);
stream_
Read
(
s
,
NULL
,
46
);
for
(
;
;
)
for
(
;
;
)
{
{
asf_object_t
*
p_obj
=
malloc
(
sizeof
(
asf_object_t
)
);
asf_object_t
*
p_obj
=
malloc
(
sizeof
(
asf_object_t
)
);
...
...
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