[vlc-commits] AVI: remove unnecessary macros

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu May 24 13:04:08 2012 +0200| [bfd3b95b54b89fd6f6f91681afdadbc085c20c1d] | committer: Jean-Baptiste Kempf

AVI: remove unnecessary macros

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bfd3b95b54b89fd6f6f91681afdadbc085c20c1d
---

 modules/demux/avi/libavi.c |    4 ++--
 modules/demux/avi/libavi.h |   15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index de82779..176c47d 100644
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -784,7 +784,7 @@ static int AVI_ChunkFunctionFind( vlc_fourcc_t i_fourcc )
     }
 }
 
-int  _AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father )
+int  AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father )
 {
     int i_index;
 
@@ -823,7 +823,7 @@ int  _AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father )
     return AVI_NextChunk( s, p_chk );
 }
 
-void _AVI_ChunkFree( stream_t *s,
+void AVI_ChunkFree( stream_t *s,
                      avi_chunk_t *p_chk )
 {
     int i_index;
diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h
index e659daa..1dde7dd 100644
--- a/modules/demux/avi/libavi.h
+++ b/modules/demux/avi/libavi.h
@@ -240,10 +240,10 @@ typedef union avi_chunk_u
 /****************************************************************************
  * Stream(input) access functions
  ****************************************************************************/
-int     _AVI_ChunkRead( stream_t *,
+int     AVI_ChunkRead( stream_t *,
                         avi_chunk_t *p_chk,
                         avi_chunk_t *p_father );
-void    _AVI_ChunkFree( stream_t *, avi_chunk_t * );
+void    AVI_ChunkFree( stream_t *, avi_chunk_t * );
 
 int     _AVI_ChunkCount( avi_chunk_t *, vlc_fourcc_t );
 void   *_AVI_ChunkFind ( avi_chunk_t *, vlc_fourcc_t, int );
@@ -251,17 +251,12 @@ void   *_AVI_ChunkFind ( avi_chunk_t *, vlc_fourcc_t, int );
 int     AVI_ChunkReadRoot( stream_t *, avi_chunk_t *p_root );
 void    AVI_ChunkFreeRoot( stream_t *, avi_chunk_t  *p_chk );
 
-#define AVI_ChunkRead( s, p_chk, p_father ) \
-    _AVI_ChunkRead( s, p_chk, (avi_chunk_t*)p_father )
 #define AVI_ChunkCount( p_chk, i_fourcc ) \
-    _AVI_ChunkCount( (avi_chunk_t*)p_chk, i_fourcc )
+    _AVI_ChunkCount( AVI_CHUNK(p_chk), i_fourcc )
 #define AVI_ChunkFind( p_chk, i_fourcc, i_number ) \
-    _AVI_ChunkFind( (avi_chunk_t*)p_chk, i_fourcc, i_number )
-#define AVI_ChunkFree( a, b ) \
-    _AVI_ChunkFree( (a), (avi_chunk_t*)(b) )
+    _AVI_ChunkFind( AVI_CHUNK(p_chk), i_fourcc, i_number )
 
-
-    /* *** avi stuff *** */
+/* *** avi stuff *** */
 
 #define AVIFOURCC_RIFF         VLC_FOURCC('R','I','F','F')
 #define AVIFOURCC_ON2          VLC_FOURCC('O','N','2',' ')