Revert "Minor typo & Jenkins "build artifacts""

This reverts commit b9f71a2.
thexai · Dec 8, 2019 · 04770a4 · 04770a4
1 parent b9f71a2
commit 04770a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/windows/RendererBase.h b/xbmc/cores/VideoPlayer/VideoRenderers/windows/RendererBase.h
@@ -7,16 +7,15 @@
  */
 #pragma once
 
+#include "cores/VideoSettings.h"
+#include "guilib/D3DResource.h"
 #include "VideoRenderers/ColorManager.h"
 #include "VideoRenderers/RenderInfo.h"
 #include "VideoRenderers/VideoShaders/WinVideoFilter.h"
-#include "cores/VideoSettings.h"
-#include "guilib/D3DResource.h"
-
-#include <vector>
 
 #include <d3d11.h>
 #include <dxgi1_5.h>
+#include <vector>
 extern "C" {
 #include <libavutil/mastering_display_metadata.h>
 }

diff --git a/xbmc/rendering/dx/DeviceResources.cpp b/xbmc/rendering/dx/DeviceResources.cpp
@@ -1230,7 +1230,7 @@ void DX::DeviceResources::SetHdrMetaData(DXGI_HDR_METADATA_HDR10& hdr10) const
                  "STREAM Static HDR Metadata => RP {0:0.3f} {1:0.3f} | GP {2:0.3f} {3:0.3f} | BP "
                  "{4:0.3f} {5:0.3f} | WP {6:0.3f} "
                  "{7:0.3f} | MAX ML {8:0.0f} "
-                 "| min ML {9:0.3f} | Max CLL {10:0.0f} | Max FALL {11:0.0f}",
+                 "| min ML {9:0.3f} | Max CLL {10:d} | Max FALL {11:d}",
                  RP_0, RP_1, GP_0, GP_1, BP_0, BP_1, WP_0, WP_1, Max_ML, min_ML,
                  hdr10.MaxContentLightLevel, hdr10.MaxFrameAverageLightLevel);
     }