ffmpeg | branch: master | Clément Bœsch <[email protected]> | Fri May 5 10:51:09 2017 +0200| [d168fe14e949b100f9552198339502331405d8ad] | committer: Clément Bœsch
Merge commit '0ac2d86c4758e1419934905b6c092910296aa16a' * commit '0ac2d86c4758e1419934905b6c092910296aa16a': dxva2: Factorize DXVA context validity test into a single macro This commit is (mostly) a noop, see 77742c75c5503c848447814a96f16abc6b9aa5f4 Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d168fe14e949b100f9552198339502331405d8ad --- libavcodec/dxva2_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index ac1f77c6a1..0f3129d93a 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -72,7 +72,7 @@ typedef union { #define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigIntraResidUnsigned : ctx->dxva2.cfg->ConfigIntraResidUnsigned) #define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigResidDiffAccelerator : ctx->dxva2.cfg->ConfigResidDiffAccelerator) #define DXVA_CONTEXT_VALID(avctx, ctx) (DXVA_CONTEXT_DECODER(avctx, ctx) && \ - DXVA_CONTEXT_CFG(avctx, ctx) && \ + DXVA_CONTEXT_CFG(avctx, ctx) && \ (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD || ctx->dxva2.surface_count)) #elif CONFIG_DXVA2 #define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (ctx->dxva2.workaround) ====================================================================== diff --cc libavcodec/dxva2_internal.h index ac1f77c6a1,daf54b20e5..0f3129d93a --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@@ -72,8 -72,8 +72,8 @@@ typedef union #define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigIntraResidUnsigned : ctx->dxva2.cfg->ConfigIntraResidUnsigned) #define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigResidDiffAccelerator : ctx->dxva2.cfg->ConfigResidDiffAccelerator) #define DXVA_CONTEXT_VALID(avctx, ctx) (DXVA_CONTEXT_DECODER(avctx, ctx) && \ - DXVA_CONTEXT_CFG(avctx, ctx) && \ + DXVA_CONTEXT_CFG(avctx, ctx) && \ - DXVA_CONTEXT_COUNT(avctx, ctx)) + (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD || ctx->dxva2.surface_count)) #elif CONFIG_DXVA2 #define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (ctx->dxva2.workaround) #define DXVA_CONTEXT_COUNT(avctx, ctx) (ctx->dxva2.surface_count) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
