Merge commit '0ac2d86c4758e1419934905b6c092910296aa16a'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:51:09 +0000 (10:51 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:56:21 +0000 (10:56 +0200)
* 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>
1  2 
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)