Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
8bd38ec5
Commit
8bd38ec5
authored
Oct 20, 2016
by
Hendrik Leppkes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dxva2: fix surface selection when compiled with both d3d11va and dxva2
Fixes a regression introduced in
9b462a0b
parent
5702416c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
dxva2.c
libavcodec/dxva2.c
+2
-1
No files found.
libavcodec/dxva2.c
View file @
8bd38ec5
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment