[vlc-commits] Revert "DShow: fix RGB24 Colouring" (fix #21005)

Francois Cartegnie git at videolan.org
Sun Aug 12 17:52:18 CEST 2018


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Aug 12 17:13:18 2018 +0200| [35629f774b9fcde278bfdad7f03fa3553c466a54] | committer: Francois Cartegnie

Revert "DShow: fix RGB24 Colouring" (fix #21005)

fix mentions documentation which says that's... BGR

This reverts commit 1ed99377d07a6f48e0c01d81fd00691c92570be0.

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

 modules/access/dshow/dshow.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 1c0702a942..68a379f1cf 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -703,12 +703,10 @@ static int DemuxOpen( vlc_object_t *p_this )
             /* Setup rgb mask for RGB formats */
             if( p_stream->i_fourcc == VLC_CODEC_RGB24 )
             {
-                /* This is in RGB format
-            http://msdn.microsoft.com/en-us/library/dd407253%28VS.85%29.aspx?ppud=4
-                 */
-                fmt.video.i_rmask = 0x00ff0000;
+                /* This is in BGR format */
+                fmt.video.i_bmask = 0x00ff0000;
                 fmt.video.i_gmask = 0x0000ff00;
-                fmt.video.i_bmask = 0x000000ff;
+                fmt.video.i_rmask = 0x000000ff;
             }
 
             if( p_stream->header.video.AvgTimePerFrame )



More information about the vlc-commits mailing list