* commit '326d9116':
  build: Drop unnecessary libavcodec <-> libavformat object dependencies
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e72d6fa0':
  build: Move MP2 muxer declaration away from MP3 muxer code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '67cb2c0f':
  checkasm: hevc: Iterate over features first, then over bitdepths

Noop, we don't have these checkasm tests.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'fe27792f':
  build: Move ff_mpeg12_frame_rate_tab to a separate file
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Fixes the second sample from ticket #5544.

Based on 19be5fb7 by Luca Barbato.

Based on 7471352f by Luca Barbato.

* commit '8c929037':
  build: Add a new component for H.264 parsing code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '3c08b7bc':
  ffv1: Report additional bitstream information in verbose mode

Noop, we already have bitstream information printing.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'fe6e5cbe':
  ffv1: Remove version 2 and mark version 3 as non-experimental

Noop, our ffv1 decoder is far more advanced and version 3 has been stable for a while.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7c55fac7':
  fate: Add test for webp

Noop, we already have a variety of webp tests, including a fate-webp target,
which would collide with this test.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

__MAC_10_11 can be present in updated revision of an older SDK so it
can't reliably detect availability of kAudioFormatEnhancedAC3 constant.

Fixes: b4daa2c4 ('lavc/audiotoolboxdec: add eac3 decoder')
Cc: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Previous version reviewed by: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Kyle Swanson <k@ylo.ph>

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'e48746de':
  checkasm: h264dsp: Move the x and y variables into the randomize_buffer macro
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e57de6fa':
  checkasm: h264dsp: Initialize the padding area
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '82b75251':
  Add an OpenH264 decoder wrapper

This commit is a noop, see c5d326f5Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '785c2544':
  movenc: Apply offsets on timestamps when peeking into interleaving queues
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'eccfb977':
  qsvdec_hevc: add the UID of the HEVC HW decoder plugin
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c67594a2':
  qsvdec_hevc: fix a variable name
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f62bb216':
  hwcontext_vaapi: allow transfers to/from any size of sw frame
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c3f113d5':
  vf_hwdownload: allocate the destination frame for the pool size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'fdfe0136':
  hwcontext: allocate the destination frame for the pool size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5fcae3b3':
  hwcontext: clarify the behaviour of transfer_data() for cropped frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '94ebf556':
  avconv: restructure sending EOF to filters

Noop, as its a fixup to a previously skipped commit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd2e56cf7':
  avconv: move flushing the queued frames to configure_filtergraph()

Noop, as its a fixup to a previously skipped commit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7a745f01':
  options_table: Add aliases for color properties
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

The Intel binary iHD driver does not support the
VASurfaceAttribMemoryType, so surface allocation will fail when using
it.

(cherry picked from commit 2124711b)

If no string argument is supplied when av_hwdevice_ctx_create() is
called to create a VAAPI device, we currently only try the default
X11 display (that is, $DISPLAY) to find a device, and will therefore
fail in the absence of an X server to connect to.  Change the logic
to also look for a device via the first DRM render node (that is,
"/dev/dri/renderD128"), which is probably the right thing to use in
most simple configurations which only have one DRM device.

(cherry picked from commit 121f34d5)

(cherry picked from commit 582d4211)

No longer leaks memory when used with a driver with the "render does
not destroy param buffers" quirk (i.e. Intel i965).

(cherry picked from commit 221ffca6)
Fixes ticket #5871.

The driver being used is detected inside av_hwdevice_ctx_init() and
the quirks field then set from a table of known device.  If this
behaviour is unwanted, the user can also set the quirks field
manually.

Also adds the Intel i965 driver quirk (it does not destroy parameter
buffers used in a call to vaRenderPicture()) and detects that driver
to set it.

(cherry picked from commit 4926fa9a)

This prevents a division by zero in read_packet.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Set up the encoder with a hardware context which will match the one
the decoder will use when it starts later.

Includes 02c27619, with additional
hackery to get around a3a0230a being
skipped.

* commit '444a3626':
  pixdesc: Fix AVCOL_TRC_BT2020_12 name
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f172e22d':
  pixdesc: Add aliases to SMPTE color properties
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '8a62d2c2':
  vaapi_encode: Maintain a pool of bitstream output buffers
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>