vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Mar 8 18:02:03 2012 +0100| [0e251a88966214c4e357cbe13935251fffff47db] | committer: Jean-Baptiste Kempf
ASF: correct debug/warning messages Empty function does not mean unknown guid > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0e251a88966214c4e357cbe13935251fffff47db --- modules/demux/asf/libasf.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c index 381a741..5303241 100644 --- a/modules/demux/asf/libasf.c +++ b/modules/demux/asf/libasf.c @@ -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; + 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 */ if( ASF_Object_Function[i_index].ASF_ReadObject_function == NULL ) { - msg_Warn( s, "unknown asf object (not loaded)" ); i_result = VLC_SUCCESS; } else @@ -1368,13 +1371,7 @@ static void ASF_FreeObject( stream_t *s, asf_object_t *p_obj ) } /* Now free this object */ - 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 + if( ASF_Object_Function[i_index].ASF_FreeObject_function != NULL ) { #ifdef ASF_DEBUG msg_Dbg( s, @@ -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; break; 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; } if( p_obj->common.i_type == ASF_OBJECT_DATA && _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
