* commit 'a674b312':
  build: Ignore generated mpeg12framerate test binary

This commit is a noop, see fb791d28Merged-by: Mark Thompson <sw@jkqxz.net>

* commit '5b6213ef':
  avcodec/vc1dec: fix mby_start for interlaced content

This commit is a noop, see c9f72e4bMerged-by: Mark Thompson <sw@jkqxz.net>

* commit '9b09792c':
  lavc/qsv: default la_ds to MFX_LOOKAHEAD_DS_UNKNOWN

This commit is a noop: the code in FFmpeg is slightly different and never
contained the invalid value.
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit '8bb9824f':
  qsvenc: AVBR is not supported on non-windows OS
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit 'e412d683':
  hwcontext: Perform usual uninitialisation on derived frames contexts

This commit is a noop, see 0f93cef2Merged-by: Mark Thompson <sw@jkqxz.net>

* commit 'caecb850':
  hwcontext: Perform usual initialisation on derived device contexts

This commit is a noop, see 309d6607Merged-by: Mark Thompson <sw@jkqxz.net>

* commit 'c6bc18bc':
  vf_hwupload/hwmap: Support setting a fixed pool size
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit 'e4cdef00':
  vf_scale_qsv: Support increasing hardware frame pool size
Merged-by: Mark Thompson <sw@jkqxz.net>

Broken by d23fff0d.

* commit 'b128be17':
  vf_*_vaapi: Support increasing hardware frame pool size

Rewritten to apply to common VAAPI code rather than specific filters.
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit '6d86cef0':
  lavfi: Add support for increasing hardware frame pool sizes
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit 'cad739da':
  lavc: Add per-thread surfaces in get_hw_frame_parameters()
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit '5b145290':
  lavc: Add support for increasing hardware frame pool sizes
Merged-by: Mark Thompson <sw@jkqxz.net>

Fixes an assertion failure:
Assertion size >= 2 failed at libavformat/matroskaenc.c:298

A basic test for demuxing raw AAC (ADTS) with ID3v2 tags.

While rare, ID3 tags may be inserted between ADTS frames. This change enables
parsing them and setting the appropriate metadata updated event flag.

Fixes compilation of libavformat when librtmp is enabled but all the
relevant protocols are disabled.
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Bug-Id: 1100
Bug-Id: ffmpeg/Ticket2531
Cc: libav-stable@libav.org

* commit 'fd36cf6b':
  configure: Factorize check_64_bit()
Merged-by: James Almer <jamrial@gmail.com>

* commit '38434a9f':
  configure: Simplify restrict keyword handling
Merged-by: James Almer <jamrial@gmail.com>

* commit '4cf84e25':
  Drop some unnecessary config.h #includes
Merged-by: James Almer <jamrial@gmail.com>

* commit 'bca41545':
  configure: Group code that sets the license string with licensing checks
Merged-by: James Almer <jamrial@gmail.com>

* commit '2eb396b1':
  hwcontext: Fix memory leak on derived frame allocation failure
Merged-by: James Almer <jamrial@gmail.com>

* commit '96e476cc':
  hwcontext: Fix documentation for av_hwdevice_ctx_alloc()

This commit is a noop, see 9365dfcbMerged-by: James Almer <jamrial@gmail.com>

* commit '8965e2af':
  avpacket: Initialize the allocated padding area in side data

This commit is a noop, see 9cbb3fceMerged-by: James Almer <jamrial@gmail.com>

* commit '5085f25a':
  vc1: skip motion compensation when data for last picture is invalid

This commit is a noop. The crash can't be reproduced with ffmpeg.
Merged-by: James Almer <jamrial@gmail.com>

* commit '6829a079':
  qsvdec: Relax the surface vs coded dimension check
Merged-by: James Almer <jamrial@gmail.com>

MFX_LOOKAHEAD_DS_UNKNOWN means auto.
-1 is not a valid value.
Signed-off-by: Ruiling Song <ruiling.song@intel.com>
Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>

AVBR is supported from API 1.3 but only available for Windows
Signed-off-by: Zhong Li <zhong.li@intel.com>
Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>

Remove runtime check at codec_desc.c
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>

The initialisation should be common.  For libmfx, it was previously
happening in the derivation function and this moves it out.

These filters do not directly know whether the API they are using will
support dynamic frame pools, so this is somewhat tricky.  If the user
sets extra_hw_frames, we assume that they are aware of the problem and
set a fixed size based on that.  If not, most cases use dynamic sizing
just like they did previously.  The hardware-reverse-mapping case for
hwmap previously had a large fixed size (64) here, primarily as a hack
for QSV use - this is removed and extra_hw_frames will need to be set
for QSV to work since it requires fixed-size pools (as the other cases
do, and which didn't work before).

The deinterlacer does not change, because it does not allocate any new
frames (for output it uses the same pool as the input).

Defaults to 10 frames to preserve compatibility, but can allocate
fewer if extra_hw_frames is set explicitly.

AVFilterContext.extra_hw_frames functions identically to the field of
the same name in AVCodecContext.

This number is definitely required when frame threading is enabled, so
add it here rather than forcing all users to handle it themselves.

DXVA2 contained this addition in specific code as well (therefore being
added twice in the internal case) - just remove it from there.

AVCodecContext.extra_hw_frames is added to the size of hardware frame
pools created by libavcodec for APIs which require fixed-size pools.
This allows the user to keep references to a greater number of frames
after decode, which may be necessary for some use-cases.

It is also added to the initial_pool_size value returned by
avcodec_get_hw_frames_parameters() if a fixed-size pool is required.