Skip to content

V
vlc-1.1
Commit c48d7837 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* Merged trunk changeset 9265 to 0.8.1 branch.

parent d0bc42f4
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
modules/demux/avi/avi.c
View file @ c48d7837
...@@ -2118,7 +2118,7 @@ static void AVI_IndexLoad_indx( demux_t *p_demux ) ...@@ -2118,7 +2118,7 @@ static void AVI_IndexLoad_indx( demux_t *p_demux )
} }
else if( p_indx->i_indextype == AVI_INDEX_OF_INDEXES ) else if( p_indx->i_indextype == AVI_INDEX_OF_INDEXES )
{ {
avi_chunk_indx_t ck_sub; avi_chunk_t ck_sub;
for( i = 0; i < p_indx->i_entriesinuse; i++ ) for( i = 0; i < p_indx->i_entriesinuse; i++ )
{ {
if( stream_Seek( p_demux->s, p_indx->idx.super[i].i_offset )|| if( stream_Seek( p_demux->s, p_indx->idx.super[i].i_offset )||
...@@ -2126,7 +2126,7 @@ static void AVI_IndexLoad_indx( demux_t *p_demux ) ...@@ -2126,7 +2126,7 @@ static void AVI_IndexLoad_indx( demux_t *p_demux )
{ {
break; break;
} }
__Parse_indx( p_demux, i_stream, &ck_sub ); __Parse_indx( p_demux, i_stream, &ck_sub.indx );
} }
} }
else else
......
modules/demux/avi/libavi.h
View file @ c48d7837
...@@ -224,10 +224,7 @@ int AVI_ChunkReadRoot( stream_t *, avi_chunk_t *p_root ); ...@@ -224,10 +224,7 @@ 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 ) \ #define AVI_ChunkRead( s, p_chk, p_father ) \
_AVI_ChunkRead( s, \ _AVI_ChunkRead( s, p_chk, (avi_chunk_t*)p_father )
(avi_chunk_t*)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_t*)p_chk, i_fourcc )
#define AVI_ChunkFind( p_chk, i_fourcc, i_number ) \ #define AVI_ChunkFind( p_chk, i_fourcc, i_number ) \
......
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