[vlc-commits] demux: avi: 32bit has alpha padding on LE most significant

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Feb 28 19:38:32 2018 +0100| [28927ec120fd3c578f466d32bf611ca0f5bcd81c] | committer: Hugo Beauzée-Luyssen

demux: avi: 32bit has alpha padding on LE most significant

(cherry picked from commit f281f7606bb5b61e6599b19eabf06378d7538d85)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=28927ec120fd3c578f466d32bf611ca0f5bcd81c
---

 modules/demux/avi/avi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 374b930269..8dab8f776d 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -612,8 +612,12 @@ static int Open( vlc_object_t * p_this )
 
                     switch( tk->fmt.i_codec )
                     {
-                    case VLC_CODEC_RGB24:
-                    case VLC_CODEC_RGB32: /* BGR (see biBitCount) */
+                    case VLC_CODEC_RGB32:
+                        tk->fmt.video.i_bmask = 0xff000000;
+                        tk->fmt.video.i_gmask = 0x00ff0000;
+                        tk->fmt.video.i_rmask = 0x0000ff00;
+                        break;
+                    case VLC_CODEC_RGB24: /* BGR (see biBitCount) */
                         tk->fmt.video.i_bmask = 0x00ff0000;
                         tk->fmt.video.i_gmask = 0x0000ff00;
                         tk->fmt.video.i_rmask = 0x000000ff;