Merge pull request #5615 from jernejsk/h6-vp8-fix

This commit is contained in:
Lukas Rusak 2021-09-10 11:36:04 -07:00 committed by GitHub
commit 550ad06d56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -78,16 +78,14 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
},
.codec = CEDRUS_CODEC_H265,
},
@@ -556,7 +602,8 @@ static const struct cedrus_variant sun50
@@ -556,6 +602,7 @@ static const struct cedrus_variant sun50
CEDRUS_CAPABILITY_MPEG2_DEC |
CEDRUS_CAPABILITY_H264_DEC |
CEDRUS_CAPABILITY_H265_DEC |
- CEDRUS_CAPABILITY_VP8_DEC,
+ CEDRUS_CAPABILITY_H265_DEC |
+ CEDRUS_CAPABILITY_H265_10_DEC,
+ CEDRUS_CAPABILITY_H265_10_DEC |
CEDRUS_CAPABILITY_VP8_DEC,
.mod_rate = 600000000,
};
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@ -32,6 +32,7 @@