mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 06:57:50 +00:00
linux (Rockchip): rkvdec_s_ctrl function is now upstream
Patch as-is for HEVC does not apply
d35c64eccf
This commit is contained in:
parent
7b53834941
commit
820c17065e
@ -2620,15 +2620,6 @@ diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvde
|
|||||||
index f55abb7c377f..00a9bf583596 100644
|
index f55abb7c377f..00a9bf583596 100644
|
||||||
--- a/drivers/staging/media/rkvdec/rkvdec.c
|
--- a/drivers/staging/media/rkvdec/rkvdec.c
|
||||||
+++ b/drivers/staging/media/rkvdec/rkvdec.c
|
+++ b/drivers/staging/media/rkvdec/rkvdec.c
|
||||||
@@ -74,7 +74,7 @@ static int rkvdec_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
||||||
{
|
|
||||||
struct rkvdec_ctx *ctx = container_of(ctrl->handler, struct rkvdec_ctx, ctrl_hdl);
|
|
||||||
|
|
||||||
- if (ctrl->id == V4L2_CID_STATELESS_H264_SPS && !ctx->valid_fmt) {
|
|
||||||
+ if (!ctx->valid_fmt) {
|
|
||||||
ctx->valid_fmt = rkvdec_valid_fmt(ctx, ctrl);
|
|
||||||
if (ctx->valid_fmt) {
|
|
||||||
struct v4l2_pix_format_mplane *pix_mp;
|
|
||||||
@@ -134,6 +134,62 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = {
|
@@ -134,6 +134,62 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user