Commit 57a0c5fa authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ade4ecb4'

* commit 'ade4ecb4':
  dxva2: Use correct printf format strings
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 075989c3 ade4ecb4
...@@ -63,7 +63,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, ...@@ -63,7 +63,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx,
hr = IDirectXVideoDecoder_GetBuffer(ctx->decoder, type, hr = IDirectXVideoDecoder_GetBuffer(ctx->decoder, type,
&dxva_data, &dxva_size); &dxva_data, &dxva_size);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %d: 0x%x\n", av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %u: 0x%lx\n",
type, hr); type, hr);
return -1; return -1;
} }
...@@ -77,14 +77,14 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, ...@@ -77,14 +77,14 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx,
result = 0; result = 0;
} else { } else {
av_log(avctx, AV_LOG_ERROR, "Buffer for type %d was too small\n", type); av_log(avctx, AV_LOG_ERROR, "Buffer for type %u was too small\n", type);
result = -1; result = -1;
} }
hr = IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder, type); hr = IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder, type);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Failed to release buffer type %d: 0x%x\n", "Failed to release buffer type %u: 0x%lx\n",
type, hr); type, hr);
result = -1; result = -1;
} }
...@@ -114,7 +114,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic, ...@@ -114,7 +114,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic,
} while (hr == E_PENDING && ++runs < 50); } while (hr == E_PENDING && ++runs < 50);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(avctx, AV_LOG_ERROR, "Failed to begin frame: 0x%x\n", hr); av_log(avctx, AV_LOG_ERROR, "Failed to begin frame: 0x%lx\n", hr);
return -1; return -1;
} }
...@@ -159,14 +159,14 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic, ...@@ -159,14 +159,14 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic,
exec.pExtensionData = NULL; exec.pExtensionData = NULL;
hr = IDirectXVideoDecoder_Execute(ctx->decoder, &exec); hr = IDirectXVideoDecoder_Execute(ctx->decoder, &exec);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(avctx, AV_LOG_ERROR, "Failed to execute: 0x%x\n", hr); av_log(avctx, AV_LOG_ERROR, "Failed to execute: 0x%lx\n", hr);
result = -1; result = -1;
} }
end: end:
hr = IDirectXVideoDecoder_EndFrame(ctx->decoder, NULL); hr = IDirectXVideoDecoder_EndFrame(ctx->decoder, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(avctx, AV_LOG_ERROR, "Failed to end frame: 0x%x\n", hr); av_log(avctx, AV_LOG_ERROR, "Failed to end frame: 0x%lx\n", hr);
result = -1; result = -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment