From 93b351329078249b38ce300e26585c0210b251d6 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Thu, 16 Apr 2020 16:53:11 -0700 Subject: [PATCH] Merge pull request #17683 from yol/fix-fmt-pointer Fix missing cast to void* in %p format --- .../VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp index fdd6c1aeb3548..c062daeb78c0d 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp @@ -260,8 +260,14 @@ CDVDVideoCodec::VCReturn CAddonVideoCodec::GetPicture(VideoPicture* pVideoPictur } } - CLog::Log(LOGDEBUG, LOGVIDEO, "CAddonVideoCodec: GetPicture::VC_PICTURE with pts %llu %dx%d (%dx%d) %f %p:%d offset:%d,%d,%d, stride:%d,%d,%d", picture.pts, pVideoPicture->iWidth, pVideoPicture->iHeight, pVideoPicture->iDisplayWidth, pVideoPicture->iDisplayHeight, m_displayAspect, - picture.decodedData, picture.decodedDataSize, picture.planeOffsets[0], picture.planeOffsets[1], picture.planeOffsets[2], picture.stride[0], picture.stride[1], picture.stride[2]); + CLog::Log(LOGDEBUG, LOGVIDEO, + "CAddonVideoCodec: GetPicture::VC_PICTURE with pts {} {}x{} ({}x{}) {} {}:{} " + "offset:{},{},{}, stride:{},{},{}", + picture.pts, pVideoPicture->iWidth, pVideoPicture->iHeight, + pVideoPicture->iDisplayWidth, pVideoPicture->iDisplayHeight, m_displayAspect, + fmt::ptr(picture.decodedData), picture.decodedDataSize, picture.planeOffsets[0], + picture.planeOffsets[1], picture.planeOffsets[2], picture.stride[0], + picture.stride[1], picture.stride[2]); if (picture.width != m_width || picture.height != m_height) {