Reviewed-by: NRonald S. Bultje <rsbultje@gmail.com>
Signed-off-by: NJames Almer <jamrial@gmail.com>

Fixes: unaligned memory access
Fixes: signal_sigsegv_3344165_576_cov_3406448105_DBLK_A_MAIN10_VIXS_2.bit

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Suggested-by: NChristophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes undefined behavior
Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes: signal_sigsegv_30420a5_2388_cov_1489993561_integra_lavf.mp4

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

uses comma as macro parameter separator
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Allow muxing h264 into ts with startcode "001" instead of "0001".
  lavfi/fade: Do not overread input buffer.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

log2 values which imply numeric overflow are not supported
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Also drop initialization since it is initialized later on before any
usage.

Fixes ticket #2220.
Fixes ticket #4324.

Fixes out of array read
Fixes: asan_heap-oob_ae74b5_3610_cov_1739568095_test.3g2

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes out of array read
Fixes: asan_heap-oob_4d4eb0_3994_cov_3169972261_zmbv_15bit.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes out of array read
Fixes: asan_heap-oob_2ff30d2_3479_cov_3803648058_src13_hrc7_525_420_2.264

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

gas-preprocessor and armasm fail otherwise

Tested-by: Timotius Margo
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '85b3b1c4':
  xcbgrab: Unbreak parsing filename options

Conflicts:
	libavdevice/xcbgrab.c

See: db442c87Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'b31328d0':
  xcbgrab: Provide better names for the y and x option

Conflicts:
	doc/indevs.texi
	libavdevice/x11grab.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'da7e5619':
  matroskaenc: Allow writing track "forced" flag

See: d88d0b6dMerged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'd594dbec':
  rtpdec: Rename the free method to close
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '8e32b1f0':
  libavformat: Use ffio_free_dyn_buf where applicable
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '199fb402':
  rtpdec: Use ffio_free_dyn_buf

Conflicts:
	libavformat/rtpdec_latm.c
	libavformat/rtpdec_svq3.c
	libavformat/rtpdec_xiph.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '8a273a74':
  avio: Add an internal utility function for freeing dynamic buffers
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '078d43e2':
  rtpdec: Free depacketizers if the init function failed
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'bb4a310b':
  rtpdec: Don't free the payload context in the .free function

Conflicts:
	libavformat/rtpdec_latm.c
	libavformat/rtpdec_mpeg4.c
	libavformat/rtpdec_mpegts.c
	libavformat/rtpdec_xiph.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'f4b59334':
  rtpdec: Remove the now unused .alloc field
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Simplify code
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '78791c08':
  rtpdec: Use .init instead of .alloc to set default values

Conflicts:
	libavformat/rdt.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '88434f97':
  rtpdec: Remove unnecessary inline attributes
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'ec96a89c':
  rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'ac0e54fd':
  rtpdec: Add const to string parameters in internal fmtp parsing functions
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '12251f99':
  rtpdec: Remove unnecessary checks
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'c82bf15d':
  rtpenc: Merge the h264 and hevc packetizers

Conflicts:
	libavformat/rtpenc_hevc.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '3567b91e':
  rtpdec_hevc: Share the implementation of fragmented packets with h264

Conflicts:
	libavformat/rtpdec_h264.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'f3449062':
  rtpdec_hevc: Reduce indentation level by returning early on errors

Conflicts:
	libavformat/rtpdec_hevc.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '8633fb47':
  rtpdec_hevc: Share the implementation of parsing a=framesize with h264

Conflicts:
	libavformat/rtpdec_h264.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '5956f489':
  rtpdec_hevc: Add asterisks at the start of each long comment line
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '5d8cae45':
  rtpdec: Get rid of all trivial .alloc/.free functions
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'e72605f8':
  rtpdec: Allow allocating and freeing the private data without explicit functions
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '2b982e92':
  rtpdec: Set need_parsing via a handler field
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'b7a4c319':
  rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

CC: libav-stable@libav.org
Signed-off-by: NLuca Barbato <lu_zero@gentoo.org>