From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sat, 17 Nov 2012 02:23:59 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~11
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=92aa0fb3b569b4678bc08d6061d3115517d54252;hp=cf34f9fd4c28854152a995bdc9243b8a7bb893a1;p=deb_libcec.git

Merge branch 'master' into release
---

diff --git a/src/lib/implementations/PHCommandHandler.h b/src/lib/implementations/PHCommandHandler.h
index d1788c0..cf61c66 100644
--- a/src/lib/implementations/PHCommandHandler.h
+++ b/src/lib/implementations/PHCommandHandler.h
@@ -71,6 +71,7 @@ namespace CEC
     virtual int HandleUserControlRelease(const cec_command& command);
     virtual bool TransmitVendorID(const cec_logical_address iInitiator, const cec_logical_address iDestination, uint64_t iVendorId, bool bIsReply);
     virtual int HandleDeviceVendorId(const cec_command& command);
+    virtual int HandleVendorRemoteButtonUp(const cec_command & UNUSED(command)) { m_iLastKeyCode = CEC_USER_CONTROL_CODE_UNKNOWN; return COMMAND_HANDLED; }
     uint8_t            m_iLastKeyCode;
     CImageViewOnCheck* m_imageViewOnCheck;
   };