media: rkvdec: Don't require unneeded H264_SLICE_PARAMS

[linux-2.6-microblaze.git] / drivers / staging / media / rkvdec / rkvdec-h264.c

diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c
index 90f2118..c45cd16 100644 (file)
--- a/drivers/staging/media/rkvdec/rkvdec-h264.c
+++ b/drivers/staging/media/rkvdec/rkvdec-h264.c
@@ -109,7 +109,6 @@ struct rkvdec_h264_reflists {
 struct rkvdec_h264_run {
        struct rkvdec_run base;
        const struct v4l2_ctrl_h264_decode_params *decode_params;
-       const struct v4l2_ctrl_h264_slice_params *slices_params;
        const struct v4l2_ctrl_h264_sps *sps;
        const struct v4l2_ctrl_h264_pps *pps;
        const struct v4l2_ctrl_h264_scaling_matrix *scaling_matrix;
@@ -1066,9 +1065,6 @@ static void rkvdec_h264_run_preamble(struct rkvdec_ctx *ctx,
        ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
                              V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS);
        run->decode_params = ctrl ? ctrl->p_cur.p : NULL;
-       ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
-                             V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS);
-       run->slices_params = ctrl ? ctrl->p_cur.p : NULL;
        ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
                              V4L2_CID_MPEG_VIDEO_H264_SPS);
        run->sps = ctrl ? ctrl->p_cur.p : NULL;