Commit 62c6016e authored by Filip Roséen's avatar Filip Roséen Committed by Jean-Baptiste Kempf

AVI demux: renamed reserved identifiers

  * Renamed `_AVI_ChunkCount` and `_AVI_ChunkFind` to `AVI_ChunkCount_`
    and `AVI_ChunkFind_` respectivelly since the former versions are
    reserved identifiers according to the C standard.
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 92b83379
......@@ -1114,7 +1114,7 @@ void AVI_ChunkFreeRoot( stream_t *s,
}
int _AVI_ChunkCount( avi_chunk_t *p_chk, vlc_fourcc_t i_fourcc )
int AVI_ChunkCount_( avi_chunk_t *p_chk, vlc_fourcc_t i_fourcc )
{
int i_count;
avi_chunk_t *p_child;
......@@ -1139,7 +1139,7 @@ int _AVI_ChunkCount( avi_chunk_t *p_chk, vlc_fourcc_t i_fourcc )
return i_count;
}
void *_AVI_ChunkFind( avi_chunk_t *p_chk,
void *AVI_ChunkFind_( avi_chunk_t *p_chk,
vlc_fourcc_t i_fourcc, int i_number )
{
avi_chunk_t *p_child;
......
......@@ -254,17 +254,17 @@ int AVI_ChunkRead( stream_t *,
avi_chunk_t *p_father );
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 );
int AVI_ChunkCount_( avi_chunk_t *, vlc_fourcc_t );
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 );
int AVI_ChunkFetchIndexes( stream_t *, avi_chunk_t *p_riff );
#define AVI_ChunkCount( p_chk, i_fourcc ) \
_AVI_ChunkCount( AVI_CHUNK(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(p_chk), i_fourcc, i_number )
AVI_ChunkFind_( AVI_CHUNK(p_chk), i_fourcc, i_number )
/* *** avi stuff *** */
......
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