vlc/vlc-2.2 | branch: master | Francois Cartegnie <[email protected]> | Wed Nov 22 12:01:36 2017 +0100| [f5224a057e5d6c99cd3ba2f3b00988a93f6c396f] | committer: Francois Cartegnie
demux: avi: really fix chunk type check eb46af662809b554ba8beb16ea5401535b2cdbd4 backport > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f5224a057e5d6c99cd3ba2f3b00988a93f6c396f --- modules/demux/avi/libavi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c index 93cfebe4d9..c22a6c4399 100644 --- a/modules/demux/avi/libavi.c +++ b/modules/demux/avi/libavi.c @@ -1116,7 +1116,7 @@ int AVI_ChunkCount_( avi_chunk_t *p_chk, vlc_fourcc_t i_fourcc, bool b_list ) continue; if( p_child->common.i_chunk_fourcc != i_fourcc && - p_child->list.i_type != i_fourcc ) + (!b_list || p_child->list.i_type != i_fourcc) ) continue; i_count++; @@ -1138,7 +1138,7 @@ void *AVI_ChunkFind_( avi_chunk_t *p_chk, continue; if( p_child->common.i_chunk_fourcc != i_fourcc && - p_child->list.i_type != i_fourcc ) + (!b_list || p_child->list.i_type != i_fourcc) ) continue; if( i_number-- == 0 ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
