aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Lhomme <robux4@gmail.com>2017-01-04 09:39:31 +0100
committerAnton Khirnov <anton@khirnov.net>2017-01-09 10:48:54 +0100
commit2835e9a9fd2b355e7936d1024ff1bf5fe454e428 (patch)
tree2eb563000443e8c3b634770d1d646fab1fa613d6
parent0ac2d86c4758e1419934905b6c092910296aa16a (diff)
downloadffmpeg-2835e9a9fd2b355e7936d1024ff1bf5fe454e428.tar.gz
hevcdec: add P010 support for D3D11VA
Given it's the same API than DVXA2 I don't know why the same output was not enabled for both. Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/hevcdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 8326690038..700b5f09a0 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -388,6 +388,9 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
if (sps->pix_fmt == AV_PIX_FMT_YUV420P || sps->pix_fmt == AV_PIX_FMT_YUVJ420P ||
sps->pix_fmt == AV_PIX_FMT_YUV420P10) {
+#if CONFIG_HEVC_D3D11VA_HWACCEL
+ *fmt++ = AV_PIX_FMT_D3D11VA_VLD;
+#endif
#if CONFIG_HEVC_DXVA2_HWACCEL
*fmt++ = AV_PIX_FMT_DXVA2_VLD;
#endif
@@ -396,9 +399,6 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
#endif
}
if (sps->pix_fmt == AV_PIX_FMT_YUV420P || sps->pix_fmt == AV_PIX_FMT_YUVJ420P) {
-#if CONFIG_HEVC_D3D11VA_HWACCEL
- *fmt++ = AV_PIX_FMT_D3D11VA_VLD;
-#endif
#if CONFIG_HEVC_VDPAU_HWACCEL
*fmt++ = AV_PIX_FMT_VDPAU;
#endif