[vlc-commits] Fix problem with black and/or random colours for paletted codecs, like MSRLE.

[Frode Tennebø]

vlc/vlc-2.0 | branch: master | Frode Tennebø <frode at tennebo.com> | Sat Apr  7 14:53:21 2012 +0200| [72d830b5754ec4f7563c4759c6a908980fac5c23] | committer: Jean-Baptiste Kempf

Fix problem with black and/or random colours for paletted codecs, like MSRLE.

Shoulc close #5952

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 7f99f183c055dbb657a896adb568687b6264df44)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=72d830b5754ec4f7563c4759c6a908980fac5c23
---

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

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 217b1b8..5bd4276 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -530,7 +530,7 @@ static int Open( vlc_object_t * p_this )
                 fmt.video.i_frame_rate = tk->i_rate;
                 fmt.video.i_frame_rate_base = tk->i_scale;
                 fmt.i_extra =
-                    __MIN( p_vids->p_bih->biSize - sizeof( VLC_BITMAPINFOHEADER ),
+                    __MAX( p_vids->p_bih->biSize - sizeof( VLC_BITMAPINFOHEADER ),
                            p_vids->i_chunk_size - sizeof(VLC_BITMAPINFOHEADER) );
                 if( fmt.i_extra > 0 )
                 {