Skip to content

V
vlc-2-2
Commit bfd3b95b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

AVI: remove unnecessary macros

parent 4c420f95
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 12 deletions
modules/demux/avi/libavi.c
View file @ bfd3b95b
...@@ -784,7 +784,7 @@ static int AVI_ChunkFunctionFind( vlc_fourcc_t i_fourcc ) ...@@ -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; int i_index;
...@@ -823,7 +823,7 @@ int _AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father ) ...@@ -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 ); return AVI_NextChunk( s, p_chk );
} }
void _AVI_ChunkFree( stream_t *s, void AVI_ChunkFree( stream_t *s,
avi_chunk_t *p_chk ) avi_chunk_t *p_chk )
{ {
int i_index; int i_index;
......
modules/demux/avi/libavi.h
View file @ bfd3b95b
...@@ -240,10 +240,10 @@ typedef union avi_chunk_u ...@@ -240,10 +240,10 @@ typedef union avi_chunk_u
/**************************************************************************** /****************************************************************************
* Stream(input) access functions * Stream(input) access functions
****************************************************************************/ ****************************************************************************/
int _AVI_ChunkRead( stream_t *, int AVI_ChunkRead( stream_t *,
avi_chunk_t *p_chk, avi_chunk_t *p_chk,
avi_chunk_t *p_father ); 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 ); int _AVI_ChunkCount( avi_chunk_t *, vlc_fourcc_t );
void *_AVI_ChunkFind ( avi_chunk_t *, vlc_fourcc_t, int ); void *_AVI_ChunkFind ( avi_chunk_t *, vlc_fourcc_t, int );
...@@ -251,17 +251,12 @@ 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 ); int AVI_ChunkReadRoot( stream_t *, avi_chunk_t *p_root );
void AVI_ChunkFreeRoot( stream_t *, avi_chunk_t *p_chk ); 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 ) \ #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 ) \ #define AVI_ChunkFind( p_chk, i_fourcc, i_number ) \
_AVI_ChunkFind( (avi_chunk_t*)p_chk, i_fourcc, i_number ) _AVI_ChunkFind( AVI_CHUNK(p_chk), i_fourcc, i_number )
#define AVI_ChunkFree( a, b ) \
_AVI_ChunkFree( (a), (avi_chunk_t*)(b) )
/* *** avi stuff *** */
/* *** avi stuff *** */
#define AVIFOURCC_RIFF VLC_FOURCC('R','I','F','F') #define AVIFOURCC_RIFF VLC_FOURCC('R','I','F','F')
#define AVIFOURCC_ON2 VLC_FOURCC('O','N','2',' ') #define AVIFOURCC_ON2 VLC_FOURCC('O','N','2',' ')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment