[FFmpeg-devel] lavc/dxva2: Use correct type specifier for HRESULT

Submitted by Carl Eugen Hoyos on March 27, 2017, 7:52 a.m.

Details

Message ID 201703270952.07954.cehoyos@ag.or.at
State New
Headers show

Commit Message

Carl Eugen Hoyos March 27, 2017, 7:52 a.m.
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 <cehoyos@ag.or.at>
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(-)

Comments

Carl Eugen Hoyos March 27, 2017, 7:54 a.m.
2017-03-27 9:52 GMT+02:00 Carl Eugen Hoyos <cehoyos@ag.or.at>:
> Hi!
>
> This is untested, sorry if this not wanted / plain wrong.

The "x" are wrong, I guess.
So is such a change wanted?

Carl Eugen
Hendrik Leppkes March 27, 2017, 8:57 a.m.
On Mon, Mar 27, 2017 at 9:54 AM, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> 2017-03-27 9:52 GMT+02:00 Carl Eugen Hoyos <cehoyos@ag.or.at>:
>> Hi!
>>
>> This is untested, sorry if this not wanted / plain wrong.
>
> The "x" are wrong, I guess.
> So is such a change wanted?
>

Using %hr is probably pretty nice, if it works everywhere -  so
basically, does mingw-printf support that?

- Hendrik
Clément Bœsch March 27, 2017, 9:04 a.m.
On Mon, Mar 27, 2017 at 10:57:44AM +0200, Hendrik Leppkes wrote:
> On Mon, Mar 27, 2017 at 9:54 AM, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> > 2017-03-27 9:52 GMT+02:00 Carl Eugen Hoyos <cehoyos@ag.or.at>:
> >> Hi!
> >>
> >> This is untested, sorry if this not wanted / plain wrong.
> >
> > The "x" are wrong, I guess.
> > So is such a change wanted?
> >
> 
> Using %hr is probably pretty nice, if it works everywhere -  so
> basically, does mingw-printf support that?
> 

Note: safe alternative is to make a cast.

Patch hide | download patch | download mbox

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;
     }