summaryrefslogtreecommitdiff
path: root/libavcodec/dxva2.c
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2018-01-29 22:55:11 +0000
committerMark Thompson <sw@jkqxz.net>2018-02-11 22:00:48 +0000
commitcad739dace55e3446ef7180de688173cd19fb000 (patch)
treefc1bcae97b28bb85b9600228e98195f39dd1f6da /libavcodec/dxva2.c
parent5b145290df2998a9836a93eb925289c6c8b63af0 (diff)
downloadffmpeg-cad739dace55e3446ef7180de688173cd19fb000.tar.gz
lavc: Add per-thread surfaces in get_hw_frame_parameters()
This number is definitely required when frame threading is enabled, so add it here rather than forcing all users to handle it themselves. DXVA2 contained this addition in specific code as well (therefore being added twice in the internal case) - just remove it from there.
Diffstat (limited to 'libavcodec/dxva2.c')
-rw-r--r--libavcodec/dxva2.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
index e34409d44a..939b45a65b 100644
--- a/libavcodec/dxva2.c
+++ b/libavcodec/dxva2.c
@@ -608,10 +608,6 @@ int ff_dxva2_common_frame_params(AVCodecContext *avctx,
else
num_surfaces += 2;
- /* add extra surfaces for frame threading */
- if (avctx->active_thread_type & FF_THREAD_FRAME)
- num_surfaces += avctx->thread_count;
-
frames_ctx->sw_format = avctx->sw_pix_fmt == AV_PIX_FMT_YUV420P10 ?
AV_PIX_FMT_P010 : AV_PIX_FMT_NV12;
frames_ctx->width = FFALIGN(avctx->coded_width, surface_alignment);