X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Favi%2Flibavi.c;h=678e060277f6e734bbc49217cecdfa6d8579ce20;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=40ace553d01911e1e93fac6efdf6949cca2ec5b9;hpb=3e1e9f157b908af2bfd81dc4413c002a1caa3188;p=vlc diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c index 40ace553d0..678e060277 100644 --- a/modules/demux/avi/libavi.c +++ b/modules/demux/avi/libavi.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include /* malloc(), free() */ #include #include @@ -173,7 +172,7 @@ static int AVI_ChunkRead_list( stream_t *s, avi_chunk_t *p_container ) break; } if( p_chk->common.p_father->common.i_chunk_size > 0 && - ( stream_Tell( s ) >= + ( stream_Tell( s ) > (off_t)p_chk->common.p_father->common.i_chunk_pos + (off_t)__EVEN( p_chk->common.p_father->common.i_chunk_size ) ) ) { @@ -730,7 +729,7 @@ int _AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father ) return AVI_Chunk_Function[i_index].AVI_ChunkRead_function( s, p_chk ); } else if( ( ((char*)&p_chk->common.i_chunk_fourcc)[0] == 'i' && - ((char*)&p_chk->common.i_chunk_fourcc)[1] == 'x' ) || + ((char*)&p_chk->common.i_chunk_fourcc)[1] == 'x' ) || ( ((char*)&p_chk->common.i_chunk_fourcc)[2] == 'i' && ((char*)&p_chk->common.i_chunk_fourcc)[3] == 'x' ) ) {