diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 20:45:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 20:45:55 +0100 |
| commit | 57a0c5fa9ca27d34d794beaece2462251bc06c2a (patch) | |
| tree | 4c62f7df44265fbd068bcf8feb22f63951d8ba74 /libavcodec | |
| parent | 075989c33c847dfe83eda3d9f3ee640414d23702 (diff) | |
| parent | ade4ecb42d2dacd18d04eb8df2afa8131e5ad653 (diff) | |
| download | ffmpeg-57a0c5fa9ca27d34d794beaece2462251bc06c2a.tar.gz | |
Merge commit 'ade4ecb42d2dacd18d04eb8df2afa8131e5ad653'
* commit 'ade4ecb42d2dacd18d04eb8df2afa8131e5ad653':
dxva2: Use correct printf format strings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dxva2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index f9af67a902..1b29f20816 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -63,7 +63,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, hr = IDirectXVideoDecoder_GetBuffer(ctx->decoder, type, &dxva_data, &dxva_size); 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); return -1; } @@ -77,14 +77,14 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, result = 0; } 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; } hr = IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder, type); if (FAILED(hr)) { 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); result = -1; } @@ -114,7 +114,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic, } while (hr == E_PENDING && ++runs < 50); 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; } @@ -159,14 +159,14 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic, exec.pExtensionData = NULL; hr = IDirectXVideoDecoder_Execute(ctx->decoder, &exec); 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; } end: hr = IDirectXVideoDecoder_EndFrame(ctx->decoder, NULL); 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; } |