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
0e251a88
Commit
0e251a88
authored
Mar 08, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ASF: correct debug/warning messages
Empty function does not mean unknown guid
parent
a1492c7c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
modules/demux/asf/libasf.c
modules/demux/asf/libasf.c
+7
-9
No files found.
modules/demux/asf/libasf.c
View file @
0e251a88
...
@@ -1307,10 +1307,13 @@ static int ASF_ReadObject( stream_t *s, asf_object_t *p_obj,
...
@@ -1307,10 +1307,13 @@ static int ASF_ReadObject( stream_t *s, asf_object_t *p_obj,
}
}
p_obj
->
common
.
i_type
=
ASF_Object_Function
[
i_index
].
i_type
;
p_obj
->
common
.
i_type
=
ASF_Object_Function
[
i_index
].
i_type
;
if
(
i_index
==
sizeof
(
ASF_Object_Function
)
/
sizeof
(
ASF_Object_Function
[
0
])
-
1
)
msg_Warn
(
s
,
"unknown asf object (not loaded): "
GUID_FMT
,
GUID_PRINT
(
p_obj
->
common
.
i_object_id
)
);
/* Now load this object */
/* Now load this object */
if
(
ASF_Object_Function
[
i_index
].
ASF_ReadObject_function
==
NULL
)
if
(
ASF_Object_Function
[
i_index
].
ASF_ReadObject_function
==
NULL
)
{
{
msg_Warn
(
s
,
"unknown asf object (not loaded)"
);
i_result
=
VLC_SUCCESS
;
i_result
=
VLC_SUCCESS
;
}
}
else
else
...
@@ -1368,13 +1371,7 @@ static void ASF_FreeObject( stream_t *s, asf_object_t *p_obj )
...
@@ -1368,13 +1371,7 @@ static void ASF_FreeObject( stream_t *s, asf_object_t *p_obj )
}
}
/* Now free this object */
/* Now free this object */
if
(
ASF_Object_Function
[
i_index
].
ASF_FreeObject_function
==
NULL
)
if
(
ASF_Object_Function
[
i_index
].
ASF_FreeObject_function
!=
NULL
)
{
msg_Warn
(
s
,
"unknown asf object "
GUID_FMT
,
GUID_PRINT
(
p_obj
->
common
.
i_object_id
)
);
}
else
{
{
#ifdef ASF_DEBUG
#ifdef ASF_DEBUG
msg_Dbg
(
s
,
msg_Dbg
(
s
,
...
@@ -1506,7 +1503,8 @@ asf_object_root_t *ASF_ReadObjectRoot( stream_t *s, int b_seekable )
...
@@ -1506,7 +1503,8 @@ asf_object_root_t *ASF_ReadObjectRoot( stream_t *s, int b_seekable )
p_root
->
p_index
=
(
asf_object_index_t
*
)
p_obj
;
p_root
->
p_index
=
(
asf_object_index_t
*
)
p_obj
;
break
;
break
;
default:
default:
msg_Warn
(
s
,
"unknow object found"
);
msg_Warn
(
s
,
"unknown top-level object found: "
GUID_FMT
,
GUID_PRINT
(
p_obj
->
common
.
i_object_id
)
);
break
;
break
;
}
}
if
(
p_obj
->
common
.
i_type
==
ASF_OBJECT_DATA
&&
if
(
p_obj
->
common
.
i_type
==
ASF_OBJECT_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