dxva2: fix surface selection when compiled with both d3d11va and dxva2

Fixes a regression introduced in 9b462a0b9
8 years ago · 8bd38ec5bd
parent 5702416c57
commit 8bd38ec5bd
1 changed files with 2 additions and 1 deletions
--- 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;