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

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

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>

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.

Fixes two warnings:
libavformat/rtpdec.c:155:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
libavformat/rtpdec.c:168:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

This fixes a hypothetical integer overflow
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: Ticket7005
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

In 16x8 motion compensation, for lower 16x8 region, the input to mpeg_motion() for motion_y was "motion_y + 16", which causes wrong rounding. For 4:2:0, chroma scaling for y is dividing by two and rounding toward zero. When motion_y < 0 and motion_y + 16 > 0, the rounding direction of "motion_y" and "motion_y + 16" is different and rounding "motion_y + 16" would be incorrect.

We should input "motion_y" as is to round correctly. I add "is_16x8" flag to do that.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: out of array access
Fixes: 5919/clusterfuzz-testcase-minimized-5859311382167552
Fixes: special case for theora (untested due to lack of sample)

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: OV_decode_plane.avi
Found-by: GwanYeong Kim <gy741.kim@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: OOM
Fixes: 5549/clusterfuzz-testcase-minimized-5390553567985664

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: 5540/clusterfuzz-testcase-minimized-6122458273808384

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

For B field pictures, the spec says,

> The prediction shall be made from the field of the same parity as the field being predicted.

I did it.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes breakage with --disable-muxers as it was originally limited
to the muxer, and not the demuxer.

An index should never be equal to the count. Hence we must make sure
*ctts_index < ctts_count.
Reviewed-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Should fix https://ffmpeg.org/pipermail/ffmpeg-devel/2018-February/225066.htmlSigned-off-by: Muhammad Faiz <mfcc64@gmail.com>