[vlc-commits] demux: avi: rename ChunkFree as ChunkClean

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jul 20 17:38:08 2017 +0200| [12852dda396b74f9a5b21c570a27f826efcec80f] | committer: Francois Cartegnie

demux: avi: rename ChunkFree as ChunkClean

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

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

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index c0f47ac1a8..238ef8b31f 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -2548,7 +2548,7 @@ static void AVI_IndexLoad_indx( demux_t *p_demux,
                 }
                 if( ck_sub.indx.i_indextype == AVI_INDEX_OF_CHUNKS )
                     __Parse_indx( p_demux, &p_index[i_stream], pi_last_offset, &ck_sub.indx );
-                AVI_ChunkFree( p_demux->s, &ck_sub );
+                AVI_ChunkClean( p_demux->s, &ck_sub );
             }
         }
         else
@@ -2993,7 +2993,7 @@ exit:
         msg_Warn( p_demux, "Failed to load an embedded subtitle" );
 
     if( p_indx == &ck.indx )
-        AVI_ChunkFree( p_demux->s, &ck );
+        AVI_ChunkClean( p_demux->s, &ck );
 }
 /*****************************************************************************
  * Stream management
diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index dda0e71164..408ee62a32 100644
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -973,7 +973,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_ChunkClean( stream_t *s,
                      avi_chunk_t *p_chk )
 {
     int i_index;
@@ -989,7 +989,7 @@ void AVI_ChunkFree( stream_t *s,
     while( p_child )
     {
         p_next = p_child->common.p_next;
-        AVI_ChunkFree( s, p_child );
+        AVI_ChunkClean( s, p_child );
         free( p_child );
         p_child = p_next;
     }
@@ -1112,7 +1112,7 @@ int AVI_ChunkReadRoot( stream_t *s, avi_chunk_t *p_root )
 void AVI_ChunkFreeRoot( stream_t *s,
                         avi_chunk_t  *p_chk )
 {
-    AVI_ChunkFree( s, p_chk );
+    AVI_ChunkClean( s, p_chk );
 }
 
 
diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h
index deccfb2aa8..5092996412 100644
--- a/modules/demux/avi/libavi.h
+++ b/modules/demux/avi/libavi.h
@@ -252,7 +252,7 @@ typedef union avi_chunk_u
 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_ChunkClean( stream_t *, avi_chunk_t * );
 
 int     AVI_ChunkCount_( avi_chunk_t *, vlc_fourcc_t );
 void   *AVI_ChunkFind_ ( avi_chunk_t *, vlc_fourcc_t, int );