* commit '536bb17e':
  qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as well
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd20c1189':
  hwcontext_qsv: add support for p010
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '40f74dc8':
  matroskadec: export CodecDelay

Noop, we already export CodecDelay
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '582d4211':
  vf_scale_vaapi: Respect driver quirks around buffer destruction
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '221ffca6':
  vaapi_encode: Respect driver quirks around buffer destruction
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '4926fa9a':
  hwcontext_vaapi: Add driver quirks to the hwdevice
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2ef87815':
  hwcontext_dxva2: add support for p010
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e78e5b73':
  swscale: add P010 input support

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

* commit 'b7c5f885':
  pixfmt: add P010 pixel format

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

* commit 'b55566db':
  avconv: use avcodec_parameters_copy() with streamcopy

The fate-aac-autobsf-adtstoasc changes from writing an audio bitdepth
based on the sample format, which is now available.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'be3e807c':
  oggparseopus: export pre-skip

Noop, we already export this information
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '029cf99c':
  mov: Save number of stsd elements after stream extradata allocation

Mostly noop, see 8b43ee40Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '6c445990':
  tiffenc: Check zlib support for deflate option during initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '9f732e4c':
  tiffenc: Check av_pix_fmt_desc_get() return value
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd8f3b0fb':
  targaenc: Move size check to initialization function
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'eeb6849c':
  rle: K&R formatting cosmetics
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* 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>