diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 10:51:09 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 10:56:21 +0200 |
| commit | d168fe14e949b100f9552198339502331405d8ad (patch) | |
| tree | 7514c7f8221c9b1e838aef408f4978d0211f0c0c | |
| parent | 055d6c2ea92e56b01467563cffb41fc3754bc661 (diff) | |
| parent | 0ac2d86c4758e1419934905b6c092910296aa16a (diff) | |
| download | ffmpeg-d168fe14e949b100f9552198339502331405d8ad.tar.gz | |
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 <cboesch@gopro.com>
| -rw-r--r-- | libavcodec/dxva2_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) |