diff options
| author | Mark Thompson <sw@jkqxz.net> | 2018-02-12 22:22:30 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-02-12 22:22:30 +0000 |
| commit | 9471122a1b5dec34572c3d4c675737f0493d140e (patch) | |
| tree | eb1347bfa0e2213822b1a432c0591be17ed29fd6 /libavcodec/dxva2.c | |
| parent | d23fff0d8a0e7df170c67a9dd5c1f7c1fc0da489 (diff) | |
| parent | cad739dace55e3446ef7180de688173cd19fb000 (diff) | |
| download | ffmpeg-streaming-9471122a1b5dec34572c3d4c675737f0493d140e.zip ffmpeg-streaming-9471122a1b5dec34572c3d4c675737f0493d140e.tar.gz | |
Merge commit 'cad739dace55e3446ef7180de688173cd19fb000'
* commit 'cad739dace55e3446ef7180de688173cd19fb000':
lavc: Add per-thread surfaces in get_hw_frame_parameters()
Merged-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'libavcodec/dxva2.c')
| -rw-r--r-- | libavcodec/dxva2.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 6f29470..6d83159 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -614,10 +614,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); |
