Em Thu, 2 May 2019 15:13:58 +0200 Hans Verkuil <hverkuil@xxxxxxxxx> escreveu: > This previous PR https://patchwork.linuxtv.org/patch/55818/ is now split > in two, one with patches for 5.2 and one with stuff that can go into 5.3. > > This PR contains the patches with new features for 5.3. > > Regards, > > Hans > > The following changes since commit 7afa8db323e37b9174cf78a1c9ab0ae7a9f5e7dd: > > media: vsp1: Add support for missing 16-bit RGB555 formats (2019-04-25 11:07:05 -0400) > > are available in the Git repository at: > > git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.3a > > for you to fetch changes up to 73d1351fb7d7dafd88d15848bfacfe9f16b13351: > > media: coda: use v4l2_m2m_buf_copy_metadata (2019-05-02 15:04:53 +0200) > > ---------------------------------------------------------------- > Tag branch > > ---------------------------------------------------------------- > Eugen Hristev (4): > media: atmel: atmel-isc: reworked white balance feature > media: v4l2-ctrl: fix flags for DO_WHITE_BALANCE > media: atmel: atmel-isc: add support for DO_WHITE_BALANCE > media: atmel: atmel-isc: make try_fmt error less verbose > > Philipp Zabel (12): > media: coda: move register debugging to coda_debug level 3 > media: coda: move job ready message to coda_debug level 2 > media: coda: add coda_frame_type_char helper > media: coda: improve decoder job finished debug message > media: coda: demote s_ctrl debug messages to level 2 > media: coda: add menu strings to s_ctrl debug output > media: coda: update profile and level controls after sequence initialization Patches up to here applied fine. > media: coda: add decoder MPEG-4 profile and level controls This one caused build to break. I'm stopping merging here. Regards, Mauro > media: v4l2-ctrl: add MPEG-2 profile and level controls > media: coda: add decoder MPEG-2 profile and level controls > media: coda: add lockdep asserts > media: coda: use v4l2_m2m_buf_copy_metadata > > Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 56 +++++++++++++++++++ > drivers/media/platform/atmel/atmel-isc-regs.h | 6 ++- > drivers/media/platform/atmel/atmel-isc.c | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- > drivers/media/platform/coda/Makefile | 2 +- > drivers/media/platform/coda/coda-bit.c | 69 +++++++++++++++++++----- > drivers/media/platform/coda/coda-common.c | 129 +++++++++++++++++++++++++++++++++----------- > drivers/media/platform/coda/coda-mpeg2.c | 44 +++++++++++++++ > drivers/media/platform/coda/coda-mpeg4.c | 48 +++++++++++++++++ > drivers/media/platform/coda/coda.h | 14 +++++ > drivers/media/platform/coda/coda_regs.h | 2 +- > drivers/media/v4l2-core/v4l2-ctrls.c | 24 +++++++++ > include/uapi/linux/v4l2-controls.h | 18 +++++++ > 12 files changed, 597 insertions(+), 78 deletions(-) > create mode 100644 drivers/media/platform/coda/coda-mpeg2.c > create mode 100644 drivers/media/platform/coda/coda-mpeg4.c Thanks, Mauro