From patchwork Mon Mar 27 07:52:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 3114 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp51833vss; Mon, 27 Mar 2017 00:52:44 -0700 (PDT) X-Received: by 10.28.29.88 with SMTP id d85mr8015299wmd.56.1490601164177; Mon, 27 Mar 2017 00:52:44 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 5si13206629wmu.47.2017.03.27.00.52.43; Mon, 27 Mar 2017 00:52:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12D3768837F; Mon, 27 Mar 2017 10:51:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D2C0688340 for ; Mon, 27 Mar 2017 10:51:52 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1csPRl-0006OX-8K for ffmpeg-devel@ffmpeg.org; Mon, 27 Mar 2017 09:52:13 +0200 Received: from [192.168.1.3] ([80.110.113.160]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 0vs81v0053ThyzU01vs9aY; Mon, 27 Mar 2017 09:52:09 +0200 X-SourceIP: 80.110.113.160 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Mon, 27 Mar 2017 09:52:07 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201703270952.07954.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavc/dxva2: Use correct type specifier for HRESULT X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! This is untested, sorry if this not wanted / plain wrong. Please comment, Carl Eugen From 32e617e5f3557031759f06ac939faf6fd5827da6 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 27 Mar 2017 09:49:40 +0200 Subject: [PATCH] lavc/dxva2: Use correct type specifier for HRESULT. --- libavcodec/dxva2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index c782f1c..0d3e999 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -83,7 +83,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, &dxva_data, &dxva_size); #endif if (FAILED(hr)) { - av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %u: 0x%lx\n", + av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %u: 0x%hrx\n", type, hr); return -1; } @@ -125,7 +125,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, #endif if (FAILED(hr)) { av_log(avctx, AV_LOG_ERROR, - "Failed to release buffer type %u: 0x%lx\n", + "Failed to release buffer type %u: 0x%hrx\n", type, hr); result = -1; } @@ -179,7 +179,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, } while(1); if (FAILED(hr)) { - av_log(avctx, AV_LOG_ERROR, "Failed to begin frame: 0x%lx\n", hr); + av_log(avctx, AV_LOG_ERROR, "Failed to begin frame: 0x%hrx\n", hr); #if CONFIG_D3D11VA if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE) @@ -278,7 +278,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, } #endif if (FAILED(hr)) { - av_log(avctx, AV_LOG_ERROR, "Failed to execute: 0x%lx\n", hr); + av_log(avctx, AV_LOG_ERROR, "Failed to execute: 0x%hrx\n", hr); result = -1; } @@ -295,7 +295,7 @@ end: hr = IDirectXVideoDecoder_EndFrame(DXVA2_CONTEXT(ctx)->decoder, NULL); #endif if (FAILED(hr)) { - av_log(avctx, AV_LOG_ERROR, "Failed to end frame: 0x%lx\n", hr); + av_log(avctx, AV_LOG_ERROR, "Failed to end frame: 0x%hrx\n", hr); result = -1; }