[vlc-commits] Support for newest freerdp snapshot

[Paweł Stankowski]

vlc/vlc-2.2 | branch: master | Paweł Stankowski <aambitny at gmail.com> | Wed Nov 19 02:03:08 2014 +0100| [92fd9b9eb5ecb18c34d23382e10bdda7d7d4363b] | committer: Jean-Baptiste Kempf

Support for newest freerdp snapshot

Support for 24bpp was removed from freerdp repository in commit
02c1bf14ce1f3ad2199a349066548977916d9c06.

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=92fd9b9eb5ecb18c34d23382e10bdda7d7d4363b
---

 modules/access/rdp.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/access/rdp.c b/modules/access/rdp.c
index 2011cfb..a7280a59 100644
--- a/modules/access/rdp.c
+++ b/modules/access/rdp.c
@@ -248,7 +248,13 @@ static bool postConnectHandler( freerdp *p_instance )
     p_instance->update->BeginPaint = beginPaintHandler;
     p_instance->update->EndPaint = endPaintHandler;
 
-    gdi_init( p_instance, CLRBUF_16BPP | CLRBUF_24BPP | CLRBUF_32BPP, NULL );
+    gdi_init( p_instance,
+                CLRBUF_16BPP |
+#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
+    !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
+                CLRBUF_24BPP |
+#endif
+                CLRBUF_32BPP, NULL );
 
     desktopResizeHandler( p_instance->context );
     return true;