OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5702416
)
dxva2: fix surface selection when compiled with both d3d11va and dxva2
author
Hendrik Leppkes
<h.leppkes@gmail.com>
Thu, 20 Oct 2016 17:31:34 +0000
(19:31 +0200)
committer
Hendrik Leppkes
<h.leppkes@gmail.com>
Thu, 20 Oct 2016 17:31:34 +0000
(19:31 +0200)
Fixes a regression introduced in
9b462a0b9
libavcodec/dxva2.c
patch
|
blob
|
history
diff --git
a/libavcodec/dxva2.c
b/libavcodec/dxva2.c
index
e168233
..
04a9c11
100644
(file)
--- 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;