From e4a16ee57ccda3f0219e20871ec8cc45671a4e2a Mon Sep 17 00:00:00 2001 From: Edward Barnard Date: Fri, 13 Dec 2013 00:13:15 +0000 Subject: [PATCH] All colourspaces now working --- src/zm_libvlc_camera.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/zm_libvlc_camera.cpp b/src/zm_libvlc_camera.cpp index a482c356b..538657925 100644 --- a/src/zm_libvlc_camera.cpp +++ b/src/zm_libvlc_camera.cpp @@ -47,16 +47,16 @@ LibvlcCamera::LibvlcCamera( int p_id, const std::string &p_path, int p_width, in /* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */ if(colours == ZM_COLOUR_RGB32) { - subpixelorder = ZM_SUBPIX_ORDER_RGBA; + subpixelorder = ZM_SUBPIX_ORDER_BGRA; mTargetChroma = "RV32"; mBpp = 4; } else if(colours == ZM_COLOUR_RGB24) { - subpixelorder = ZM_SUBPIX_ORDER_RGB; + subpixelorder = ZM_SUBPIX_ORDER_BGR; mTargetChroma = "RV24"; mBpp = 3; } else if(colours == ZM_COLOUR_GRAY8) { subpixelorder = ZM_SUBPIX_ORDER_NONE; - mTargetChroma = "RGB8"; + mTargetChroma = "GREY"; mBpp = 1; } else { Panic("Unexpected colours: %d",colours);