From 8bd38ec5bde1d2691d6385975a2bad61538188bf Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Thu, 20 Oct 2016 19:31:34 +0200 Subject: dxva2: fix surface selection when compiled with both d3d11va and dxva2 Fixes a regression introduced in 9b462a0b9 --- libavcodec/dxva2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/dxva2.c') diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index e168233402..04a9c1129d 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -41,7 +41,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, void *surface = ff_dxva2_get_surface(frame); unsigned i; - for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) + for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) { #if CONFIG_D3D11VA if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD && ctx->d3d11va.surface[i] == surface) { @@ -54,6 +54,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD && ctx->dxva2.surface[i] == surface) return i; #endif + } assert(0); return 0; -- cgit v1.2.3