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

* commit '427f7a1f':
  configure: Fix the msvcrt version check for mingw32

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

* commit '2017ffc1':
  vaapi: Add ABGR map only if VA_FOURCC_ABGR is defined

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

* commit '6a7e9285':
  configure: Do not check for the __builtin_vec_vsx_ld
Merged-by: James Almer <jamrial@gmail.com>

* commit '3d040513':
  avutil/hwcontext_dxva2: Don't improperly free IDirect3DSurface9 objects
  decode: fix the code reducing cropping to preserve alignment

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

* commit 'c3f0357b':
  hevcdec: move the MD5 context out of HEVCSEIPictureHash back into HEVCContext
Merged-by: James Almer <jamrial@gmail.com>

Cosmetic change skipped in 0b30cb8d
by mistake.
Signed-off-by: James Almer <jamrial@gmail.com>

Cosmetic change skipped in 0b30cb8d
by mistake.
Signed-off-by: James Almer <jamrial@gmail.com>

* commit 'd7dcd825':
  extract_extradata_bsf: make sure all needed parameter set NALUs were found

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

* commit '3fb6b98b':
  vp9_superframe_bsf: cache input packets directly
Merged-by: James Almer <jamrial@gmail.com>

Move a subtraction to the other side of the equal to avoid overflows.

* commit '126bc2c3':
  vp9_superframe_bsf: convert to the new bitstream reader

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.htmlMerged-by: James Almer <jamrial@gmail.com>