[X2Go-Commits] [pale-moon] 129/294: Merge branch 'cdm-work'

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit c7c3c8600febd196152e5b23f687cbe8aa493627
Merge: d791dfe e9261d3
Author: wolfbeast <mcwerewolf at wolfbeast.com>
Date:   Mon Mar 18 08:12:19 2019 +0100

    Merge branch 'cdm-work'

 dom/media/gmp/widevine-adapter/WidevineAdapter.cpp |  10 +-
 .../gmp/widevine-adapter/WidevineDecryptor.cpp     | 101 +++----
 dom/media/gmp/widevine-adapter/WidevineDecryptor.h |  24 +-
 dom/media/gmp/widevine-adapter/WidevineUtils.cpp   |   4 +-
 dom/media/gmp/widevine-adapter/WidevineUtils.h     |  10 +-
 .../gmp/widevine-adapter/WidevineVideoDecoder.h    |   2 +-
 .../widevine-adapter/content_decryption_module.h   | 289 +++++++++++++--------
 .../content_decryption_module_export.h             |  22 ++
 .../content_decryption_module_ext.h                |  64 +++++
 9 files changed, 353 insertions(+), 173 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git