[vlc-commits] demux: libavi: fix boundary setup

Francois Cartegnie git at videolan.org
Thu Apr 24 15:52:31 CEST 2014


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Apr 24 15:51:29 2014 +0200| [0e6f4f958b92574f86cb06520d092a67ab51a3b4] | committer: Francois Cartegnie

demux: libavi: fix boundary setup

confusion: wanted min of max.

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

 modules/demux/avi/libavi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index 235a370..d237cfa 100644
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -433,7 +433,7 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
 
                 /* stay within VLC's limits */
                 p_chk->strf.vids.p_bih->biClrUsed =
-                    __MAX( VIDEO_PALETTE_COLORS_MAX, p_chk->strf.vids.p_bih->biClrUsed );
+                    __MIN( VIDEO_PALETTE_COLORS_MAX, p_chk->strf.vids.p_bih->biClrUsed );
             }
             else p_chk->strf.vids.p_bih->biClrUsed = 0;
 #ifdef AVI_DEBUG



More information about the vlc-commits mailing list