ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Fri Apr 7 10:08:53 2017 +0200| [e7326e2980a079432bf3f5556fdab38e92982fd1] | committer: Clément Bœsch
Merge commit '3ee5f25d37315b27f0e2d47aa69fc445545ee2e3' * commit '3ee5f25d37315b27f0e2d47aa69fc445545ee2e3': dxva2: Adjust printf length modifiers where appropriate Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7326e2980a079432bf3f5556fdab38e92982fd1 --- libavcodec/dxva2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index c782f1c..0036b5b 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%x\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%x\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%x\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%x\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%x\n", hr); result = -1; } ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog