From 28c141eed0396f2dc7326c53102dbb3e2b83de4e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 10 Jan 2012 18:08:46 +0100
Subject: [PATCH] ASF: macro removal for ASF_FindObject
---
modules/demux/asf/libasf.c | 5 +++--
modules/demux/asf/libasf.h | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index e91f1956678d..eb51c48c48a1 100644
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -1604,11 +1604,12 @@ int ASF_CountObject( void *_p_obj, const guid_t *p_guid )
return i_count;
}
-void *__ASF_FindObject( asf_object_t *p_obj, const guid_t *p_guid,
+void *ASF_FindObject( void *_p_obj, const guid_t *p_guid,
int i_number )
{
- asf_object_t *p_child;
+ asf_object_t *p_child, *p_obj;
+ p_obj = (asf_object_t *)_p_obj;
p_child = p_obj->common.p_first;
while( p_child )
diff --git a/modules/demux/asf/libasf.h b/modules/demux/asf/libasf.h
index 91d0e4566057..5eb13b37a648 100644
--- a/modules/demux/asf/libasf.h
+++ b/modules/demux/asf/libasf.h
@@ -361,5 +361,4 @@ void ASF_FreeObjectRoot( stream_t *, asf_object_root_t *p_root );
int ASF_CountObject ( void *p_obj, const guid_t *p_guid );
-#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 );
+void *ASF_FindObject( void *p_obj, const guid_t *p_guid, int i_number );
--
GitLab