vlc/vlc-2.0 | branch: master | Frode Tennebø <[email protected]> | Sat Apr 7 14:53:21 2012 +0200| [0674820a4da075bd8d9a2600e00ad76f0918be2d] | committer: Jean-Baptiste Kempf
Fix problem with black and/or random colours for paletted codecs, like MSRLE. Should close #5952 Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit 7f99f183c055dbb657a896adb568687b6264df44) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=0674820a4da075bd8d9a2600e00ad76f0918be2d --- modules/demux/avi/avi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index b9e53ed..c0df052 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( BITMAPINFOHEADER ), + __MAX( p_vids->p_bih->biSize - sizeof( BITMAPINFOHEADER ), p_vids->i_chunk_size - sizeof(BITMAPINFOHEADER) ); if( fmt.i_extra > 0 ) { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
