[vlc-commits] AVI demux: renamed reserved identifiers
Filip Roséen
git at videolan.org
Mon Feb 22 11:59:35 CET 2016
vlc | branch: master | Filip Roséen <filip at atch.se> | Mon Feb 22 01:12:57 2016 +0100| [62c6016e7a0a288d303ca6072900cf71b49c674e] | committer: 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 <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=62c6016e7a0a288d303ca6072900cf71b49c674e
---
modules/demux/avi/libavi.c | 4 ++--
modules/demux/avi/libavi.h | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index 8deb2b6..11fd2cb 100644
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -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;
diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h
index 988066b..64965f9 100644
--- a/modules/demux/avi/libavi.h
+++ b/modules/demux/avi/libavi.h
@@ -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 *** */
More information about the vlc-commits
mailing list