Merge remote-tracking branch 'v4l-dvb/master'

diff --cc Documentation/devicetree/bindings/media/cedrus.txt
Simple merge

diff --cc Documentation/media/uapi/v4l/extended-controls.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/common/videobuf2/videobuf2-core.c
Simple merge

diff --cc drivers/media/common/videobuf2/videobuf2-v4l2.c
Simple merge

diff --cc drivers/media/platform/vicodec/vicodec-core.c
index 13fb69c58967d0dbf527c4e0f39653410550da5d,2b7daff634257c9e135b4a96da19d1b8da63e3ca..0d7876f5acf0dc132443d123cf345ae44dc7274a
--- 1/drivers/media/platform/vicodec/vicodec-core.c
--- 2/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@@ -997,23 -1006,14 +1006,21 @@@ static int vicodec_start_streaming(stru
  
        q_data->sequence = 0;
  
 -      if (!V4L2_TYPE_IS_OUTPUT(q->type))
 +      if (!V4L2_TYPE_IS_OUTPUT(q->type)) {
 +              if (!ctx->is_enc) {
 +                      state->width = q_data->width;
 +                      state->height = q_data->height;
 +              }
                return 0;
 +      }
  
 -      state->width = q_data->width;
 -      state->height = q_data->height;
 +      if (ctx->is_enc) {
 +              state->width = q_data->width;
 +              state->height = q_data->height;
 +      }
        state->ref_frame.width = state->ref_frame.height = 0;
-       state->ref_frame.luma = kvmalloc(size + 2 * size / chroma_div,
-                                        GFP_KERNEL);
-       ctx->comp_max_size = size + 2 * size / chroma_div +
-                            sizeof(struct fwht_cframe_hdr);
+       state->ref_frame.luma = kvmalloc(total_planes_size, GFP_KERNEL);
+       ctx->comp_max_size = total_planes_size + sizeof(struct fwht_cframe_hdr);
        state->compressed_frame = kvmalloc(ctx->comp_max_size, GFP_KERNEL);
        if (!state->ref_frame.luma || !state->compressed_frame) {
                kvfree(state->ref_frame.luma);

diff --cc drivers/media/platform/vivid/vivid-vbi-cap.c
Simple merge

diff --cc drivers/media/platform/vivid/vivid-vid-cap.c
Simple merge

diff --cc drivers/media/platform/vivid/vivid-vid-out.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ctrls.c
Simple merge

diff --cc drivers/staging/media/sunxi/cedrus/cedrus_hw.c
Simple merge

diff --cc include/uapi/linux/videodev2.h
Simple merge