* configure.ac.in Makefile.am: enable asf demuxer plugin

 * modules/demux/asf/*: some clean up

configure.ac.in

@@ -1042,6 +1042,16 @@ then
   PLUGINS="${PLUGINS} avi"
 fi
 
+dnl
+dnl  ASF demux plugin
+dnl
+AC_ARG_ENABLE(asf,
+  [  --enable-asf            ASF demux module (default enabled)])
+if test "x${enable_asf}" != "xno"
+then
+  PLUGINS="${PLUGINS} asf"
+fi
+
 dnl
 dnl  AAC demux plugin
 dnl

modules/Makefile.am

@@ -32,6 +32,7 @@ EXTRA_DIST = \
 	demux/Modules.am \
 	demux/aac/Modules.am \
 	demux/avi/Modules.am \
+	demux/asf/Modules.am \
 	demux/mp4/Modules.am \
 	demux/mpeg/Modules.am \
 	demux/util/Modules.am \

modules/demux/asf/libasf.c

@@ -2,7 +2,7 @@
  * libasf.c : 
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: libasf.c,v 1.1 2002/10/20 17:22:33 fenrir Exp $
+ * $Id: libasf.c,v 1.2 2002/10/21 09:18:37 fenrir Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -892,7 +892,7 @@ void ASF_FreeObjectRoot( input_thread_t *p_input,
     
 }
 
-int  ASF_CountObject( asf_object_t *p_obj, const guid_t *p_guid )
+int  __ASF_CountObject( asf_object_t *p_obj, const guid_t *p_guid )
 {
     int i_count;
     asf_object_t *p_child;
@@ -915,7 +915,7 @@ int  ASF_CountObject( asf_object_t *p_obj, const guid_t *p_guid )
     return( i_count );
 }
 
-asf_object_t *ASF_FindObject( asf_object_t *p_obj, const guid_t *p_guid, int i_number )
+void *__ASF_FindObject( asf_object_t *p_obj, const guid_t *p_guid, int i_number )
 {
     asf_object_t *p_child;
 

modules/demux/asf/libasf.h

@@ -2,7 +2,7 @@
  * libasf.h : 
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: libasf.h,v 1.1 2002/10/20 17:22:33 fenrir Exp $
+ * $Id: libasf.h,v 1.2 2002/10/21 09:18:37 fenrir Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -440,8 +440,10 @@ int  ASF_ReadObjectRoot( input_thread_t *p_input,
                          int b_seekable );
 void ASF_FreeObjectRoot( input_thread_t *p_input,
                          asf_object_root_t *p_root );
+#define ASF_CountObject( a, b ) __ASF_CountObject( (asf_object_t*)(a), b )
+int  __ASF_CountObject( asf_object_t *p_obj, const guid_t *p_guid );
 
-int  ASF_CountObject( asf_object_t *p_obj, const guid_t *p_guid );
-asf_object_t *ASF_FindObject( asf_object_t *p_obj, const guid_t *p_guid, int i_number );
+#define ASF_FindObject( a, b, c )  __ASF_FindObject( (asf_object_t*)(a), b, c )
+void *__ASF_FindObject( asf_object_t *p_obj, const guid_t *p_guid, int i_number );