* commit '8d07e941':
  FATE: add a test of H.264 SEI recovery in an intra refresh stream

Our H264 decoder drops 3 frames from the beginning of the stream, but
all frames after those match, hence the difference in the fate test.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '46278ec9':
  mp3enc: write trailing padding

Noop, we have our own implementation for mp3 gapless.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd60c2d52':
  mp3dec: read the initial/trailing padding from the LAME tag

Noop, we have our own implementation for mp3 gapless tags.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7a763714':
  libopenh264enc: Simplify init by setting FF_CODEC_CAP_INIT_CLEANUP
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2d097c16':
  libopenh264enc: Return a more sensible error code in some init failure paths
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '36b380dc':
  libopenh264dec: Simplify the init thanks to FF_CODEC_CAP_INIT_CLEANUP being set
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd0b1e604':
  libopenh264dec: Fix cleanup if the init failed early
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '61cb9fac':
  mov: fix stream extradata_size allocation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '0b1bd1b2':
  lavd: Drop unneeded av_init_packet()s
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '390b95b8':
  fate: Add a mixed NAL coding sample
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

- Restored alphabetical order.
- Enhanced sections aac_adtstoasc, dca_core, h264_mp4toannexb.
- Added sections hevc_mp4toannexb and vp9_superframe.
- Renamed (if required) and filled previously empty sections
  mjpegadump, mov2textsub/text2movsub, mp3decomp, and
  remove_extra.
- Fixes ticket #3198.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Lou Logan <lou@lrcd.com>

Fix trac issue #5957.

Fixes division by 0
This is similar to how avg_frame_rate is checked elsewhere
Fixes: 6d24add0455f41b1b45b7ba615cd46f3/asan_generic_dc34c3_5480_0a2ef411cae999b9871ed71a2e481b71.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This matches the other branch
Fixes out of array read
Fixes: 4d142ca76d39fe685effcf5017098723/asan_heap-oob_31ae824_8611_348fdb64f9009b63c8a8eae9a0e497c5.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'cbbb4040':
  fate: Restore order of h264 entries
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '61bd0ed7':
  h264: Log more information about invalid NALu size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7b1ae0e7':
  checkasm/arm: preserve the stack alignment checkasm_checked_call
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '80fbb7be':
  checkasm: vp8.mc: initialize the full src buffer after ec325742Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '17c99b61':
  h2645_parse: handle embedded Annex B NAL units in size prefixed NAL units

This commit is a noop, see a9bb4cf8Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'a8cbe5a0':
  h264_ps: export actual height in MBs as SPS.mb_height
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '99cf9433':
  d3d11va: don't keep the context lock while waiting for a frame
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2866d108':
  vp8dsp: Remove the comment saying that the height is equal to the width
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '8c816c0c':
  checkasm/arm: align the clobber check data properly for ldrd
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'ec325742':
  checkasm: vp8: mc: test unequal width/height for partitions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5f74bd31':
  vp8/armv6: mc: avoid boolean expression in calculation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'fc5cdc0d':
  doc: escape left brace in texi2pod.pl regex

This commit is a noop, see e43ea1cbMerged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd825b1a5':
  libopenh264: Support building with the 1.6 release

This commit is a noop, see 293676c4Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '4f7723cb':
  movenc: Add an option for skipping writing the mfra/tfra/mfro trailer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

2% slowdown for existing decode-line timer.

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

Fixes Ticket5936
Regression since c5fc8ae1Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

uint32 need 4 bytes not 1.
Fix decoding when there is half/float and uint32 channel.

This fixes crashes due to pointer corruption caused by invalid writes.

The problem was introduced in commit
03152e74.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

channel_index can be -1.

This problem was introduced in commit
2dd7b461.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

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

Fixes null pointer dereference
Fixes: 189/FOO

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

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

They are not valid and can cause problems/crashes for API users.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

This fixes NULL pointer dereferencing for formats, where frame->data[1]
is not allocated.

The problem was introduced in commit
257fbc3a.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>