* commit 'eb061ad6':
  tls_gnutls: Readd support for nonblocking operation
Merged-by: James Almer <jamrial@gmail.com>

* commit '0671eb23':
  tls_openssl: Readd support for nonblocking operation
Merged-by: James Almer <jamrial@gmail.com>

Cosmetic change, reduces differences with libav.

* commit '84ab1cc4':
  movenc: allow alternative hvc1 h.265 codec tag
  movenc: write correct format hvcc when tag is hvc1
  movenc: move tags definitions to where they are used
  movenc: simplify codec_tag lookup
  movenc: use correct tag list for AVOutputFormat.codec_tag
  aarch64: vp9: Fix assembling with Xcode 6.2 and older
  doc: Drop the legacy symlink to README

This commit is a noop, see
998609dd
95f3c859
e199d90d
38d808d7
974d508e
369a3e11Merged-by: James Almer <jamrial@gmail.com>

Fixes: 2926/clusterfuzz-testcase-4987110014582784

This reduces decoding time from 7 to 4 seconds

The timeout should have been fixed in 0561bd2f but ossfuzz did not close this issue

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegReviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Use immediate unsigned saturation for clip to max saving one vector register.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Remove loops and unroll as block sizes are known.
Load the specific destination bytes instead of MSA load and pack.
Remove unused macro and functions.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Steven Liu <lq@onvideo.cn>

ignore the fmp4_init_filename when in normal hls segment mode
Signed-off-by: Steven Liu <lq@onvideo.cn>

Allow filters to handle larger frames.

For now, check the image size.
Inspired by a patch from Paul B Mahol.

Invalid sizes would be detected later by allocation failures,
detecting problems earlier is cleaner.

* commit 'fd1ffa1f':
  d3d11va: Link directly to dxgi.dll and d3d11.dll functions if LoadLibrary is unavailable

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

* commit 'c2b0bea4':
  avconv_hw: Free device on initialisation failure
  vf_hwmap: Properly free a locally derived device
  vf_hwmap: Add missing error code
  configure: Fix handling of _select dependencies

This commit is a noop, see
6dfcbd80
d984b29b
70808859
f434ddf4Merged-by: James Almer <jamrial@gmail.com>

* commit '7b1f9873':
  build: Adjust dependencies for faan(i)dct components
Merged-by: James Almer <jamrial@gmail.com>

* commit '635897ac':
  configure: Factorize qsv dependencies
Merged-by: James Almer <jamrial@gmail.com>

* commit 'c599c43f':
  configure: Add missing arch dependencies for arch extensions
Merged-by: James Almer <jamrial@gmail.com>

* commit '9d12dd6f':
  configure: Add x86 dependency for mmx_internal
Merged-by: James Almer <jamrial@gmail.com>

* commit '2f792cb6':
  build: Add missing idctdsp dependency for clearvideo
  build: Add missing mpeg4audio dependency for RTP muxer

This commit is a noop, see
52f954da
155f071bMerged-by: James Almer <jamrial@gmail.com>

* commit '4993a68f':
  hwcontext: Mark local table static const
  libfdk-aacdec: Correct buffer_size parameter

This commit is a noop, see
ca6776a9
0b1794a4Merged-by: James Almer <jamrial@gmail.com>

* commit '04f691cd':
  mmal: Add missing .item_name to AVClass declaration
Merged-by: James Almer <jamrial@gmail.com>

* commit 'e2edf152':
  configure: Simplify AltiVec/VSX check with a helper function
Merged-by: James Almer <jamrial@gmail.com>

* commit 'd76479c5':
  ppc: Drop support for Apple GCC
Merged-by: James Almer <jamrial@gmail.com>

* commit '97cfe1d8':
  Convert all AVClass struct declarations to designated initializers.
Merged-by: James Almer <jamrial@gmail.com>

'updatefirst' is an undocumented option redundant to older option 'update'. Since it doesn't serve as a shorthand, this patch removes it.

* commit '98ea9806':
  nvenc: Add default value for AVCodecContext::refs

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

* commit 'f9e7a2f9':
  dxva: add support for new dxva2 and d3d11 hwaccel APIs
  dxva: move d3d11 locking/unlocking to functions
  dxva: preparations for new hwaccel API
  lavc: set avctx->hwaccel before init
  lavu: add new D3D11 pixfmt and hwcontext

This commit is a noop, see
3303511f
865360ba
ab28108a
5659f740
70143a39Merged-by: James Almer <jamrial@gmail.com>

* commit 'ed434be1':
  configure: Bail out if both GnuTLS and OpenSSL are enabled
  configure: Move x86 assembler sanity check into assembler probe function
  build: Add missing zlib dependencies for several protocols

This commit is a noop, see
6dfcbd80
5cae5a1d
4600b061Merged-by: James Almer <jamrial@gmail.com>

This prevents making the DCAParseError enum part of the ABI.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: foo86 <foobaz86@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Fixes: runtime error: signed integer overflow: 924846844 + 1457520640 cannot be represented in type 'int'
Fixes: 3416/clusterfuzz-testcase-minimized-6125587682820096

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

Fixes: memcpy-param-overlap
Fixes: 3612/clusterfuzz-testcase-minimized-6393461273001984

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

* commit '908f737d':
  cmdutils: Mark conditionally used variable as av_unused
Merged-by: James Almer <jamrial@gmail.com>

* commit 'f960fd2f':
  build: Skip generating .version files when reconfiguring
Merged-by: James Almer <jamrial@gmail.com>

* commit 'a876958d':
  avutil/md5: fix misaligned reads

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

Since a7da1347, flush packets are passed
to process_input_packet() during stream copy.  This modifies the input
timestamp handling to ignore them - since they contain no data, timestamps
should not be affected.

* commit '61cec5ad':
  tls: Hide backend implementation details from users

Also includes ed434be1
Changes were made to support schannel and securetransport.
Merged-by: James Almer <jamrial@gmail.com>

* commit '5edded9d':
  smacker: Improve error handling

See c1947015Merged-by: James Almer <jamrial@gmail.com>

* commit 'b98f082d':
  smacker: Check that the data size is a multiple of a sample vector

See 4a9af07aMerged-by: James Almer <jamrial@gmail.com>

* commit '2ca75965':
  os_support: Remove the dynamic loading of getaddrinfo from the fallback getaddrinfo
Merged-by: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>