X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Favi%2Flibavi.h;h=a9510c4ed5d2ba0e1adaf9af965394da67742079;hb=8e16fb45f4e4b8b745b180e3b84ba2a8b9ffff76;hp=ff885753728e3fee698939709765673f7934eb16;hpb=ad77d955a5dc051976d94d6e08ee0f717ec3a938;p=vlc diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h index ff88575372..a9510c4ed5 100644 --- a/modules/demux/avi/libavi.h +++ b/modules/demux/avi/libavi.h @@ -174,10 +174,10 @@ typedef struct typedef struct avi_chunk_indx_s { AVI_CHUNK_COMMON - int16_t i_longsperentry; - int8_t i_indexsubtype; - int8_t i_indextype; - int32_t i_entriesinuse; + int16_t i_longsperentry; + int8_t i_indexsubtype; + int8_t i_indextype; + uint32_t i_entriesinuse; vlc_fourcc_t i_id; int64_t i_baseoffset; @@ -216,6 +216,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 * ); int _AVI_ChunkCount( avi_chunk_t *, vlc_fourcc_t ); void *_AVI_ChunkFind ( avi_chunk_t *, vlc_fourcc_t, int ); @@ -229,6 +230,8 @@ void AVI_ChunkFreeRoot( stream_t *, avi_chunk_t *p_chk ); _AVI_ChunkCount( (avi_chunk_t*)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 stuff *** */ @@ -296,6 +299,7 @@ void AVI_ChunkFreeRoot( stream_t *, avi_chunk_t *p_chk ); #define AVITWOCC_dc VLC_TWOCC('d','c') #define AVITWOCC_pc VLC_TWOCC('p','c') #define AVITWOCC_AC VLC_TWOCC('A','C') +#define AVITWOCC_tx VLC_TWOCC('t','x') /* *** codex stuff *** */ /* DV */