Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'ade4ecb42d2dacd18d04eb8df2afa8131e5ad653'

Browse Source 
* commit 'ade4ecb42d2dacd18d04eb8df2afa8131e5ad653':
  dxva2: Use correct printf format strings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/54/head
Michael Niedermayer 11 years ago
parent 075989c33c ade4ecb42d
commit 57a0c5fa9c
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libavcodec/dxva2.c

12
libavcodec/dxva2.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save