[vlc-commits] direct3d11: code cleaning

Steve Lhomme git at videolan.org
Thu Aug 27 19:28:30 CEST 2015


vlc | branch: master | Steve Lhomme <robux4 at gmail.com> | Fri Aug  7 09:11:39 2015 +0200| [48255c99c6634cf3d6a28ea5e0653df26426c0a8] | committer: Jean-Baptiste Kempf

direct3d11: code cleaning

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=48255c99c6634cf3d6a28ea5e0653df26426c0a8
---

 modules/video_output/msw/direct3d11.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/msw/direct3d11.c b/modules/video_output/msw/direct3d11.c
index 9b96cc1..a995c67 100644
--- a/modules/video_output/msw/direct3d11.c
+++ b/modules/video_output/msw/direct3d11.c
@@ -1174,13 +1174,13 @@ static void UpdatePicQuadPosition(vout_display_t *vd)
     HRESULT hr = IDXGISwapChain_GetPrivateData(sys->dxgiswapChain, &GUID_SWAPCHAIN_WIDTH, &dataSize, &i_width);
     if (FAILED(hr)) {
         msg_Err(vd, "Can't get swapchain width, size %d. (hr=0x%lX)", hr, dataSize);
-        return hr;
+        return;
     }
     dataSize = sizeof(i_height);
     hr = IDXGISwapChain_GetPrivateData(sys->dxgiswapChain, &GUID_SWAPCHAIN_HEIGHT, &dataSize, &i_height);
     if (FAILED(hr)) {
         msg_Err(vd, "Can't get swapchain height, size %d. (hr=0x%lX)", hr, dataSize);
-        return hr;
+        return;
     }
 #endif
 
@@ -1744,8 +1744,8 @@ static int Direct3D11MapSubpicture(vout_display_t *vd, int *subpicture_region_co
         picture_CopyPixels(quad_picture, r->p_picture);
 
         /* Map the subpicture to sys->rect_dest */
-        int i_original_width  = subpicture->i_original_picture_width;
-        int i_original_height = subpicture->i_original_picture_height;
+        const int i_original_width  = subpicture->i_original_picture_width;
+        const int i_original_height = subpicture->i_original_picture_height;
 
         const RECT video = sys->rect_dest;
         const float scale_w = (float)(video.right  - video.left) / i_original_width;



More information about the vlc-commits mailing list