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

* commit '4d444d04':
  configure: Default to _WIN32_WINNT=0x0502 (XP) as minimum, for legacy mingw

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

* commit '16cb06bb':
  hlsenc: Support recovery from an already present playlist

This commit is a noop. It needs extra work to apply cleanly.
Merged-by: James Almer <jamrial@gmail.com>

This makes the autobsf feature behave the same as the manual
bitstream filtering in ffmpeg.c

Fixes ticket #6794

Reviewed-by: rcombs
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

This removes sizeof(AC3HeaderInfo) from the ABI.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

Silences the following gcc warnings:
src/libavcodec/ppc/h264dsp.c: In function 'ff_h264dsp_init_ppc':
src/libavcodec/ppc/h264dsp.c:809:40: warning: assignment from incompatible pointer type
src/libavcodec/ppc/h264dsp.c:810:40: warning: assignment from incompatible pointer type
src/libavcodec/ppc/h264dsp.c:811:40: warning: assignment from incompatible pointer type
src/libavcodec/ppc/h264dsp.c:812:40: warning: assignment from incompatible pointer type

Silences a gcc warning:
src/libavcodec/ppc/svq1enc_altivec.c: In function 'ff_svq1enc_init_ppc':
src/libavcodec/ppc/svq1enc_altivec.c:80:26: warning: assignment from incompatible pointer type

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>

suppress the "warning: assignment discards ‘const’ qualifier from
pointer target type" build warning.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

suppress the "warning: assignment discards ‘const’ qualifier from
pointer target type" build warning.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

suppress the "warning: assignment discards ‘const’ qualifier from
pointer target type" build warning.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Remove unused macro.
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>

Align the mask buffer.
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>

Pack the data to half word before clipping.
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>

Fixes ticket #6785.

Should hopefully fix the invalid reads after free introduced in
e1bc3f43 for all targets.
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Aman Gupta <aman@tmm1.net>

Fixes #6780.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Also use av_packet_move_ref() to cache them instead of copying
pointers.

Fixes invalid reads since e1bc3f43.
Signed-off-by: James Almer <jamrial@gmail.com>

* commit '91622f64':
  avconv: Always initialize the opkt struct on streamcopy
Merged-by: James Almer <jamrial@gmail.com>