* commit '504403ab':
  aacsbr: Turnoff in the event of over read.

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

* commit 'b5f19f74':
  aac: Split function to parse ADTS header data into public and private part
Merged-by: James Almer <jamrial@gmail.com>

* commit '0ac1fec1':
  bitstream: Move VLC reading functions into the vlc.h header
  vlc: Add header #include when the types are used

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

* commit 'edbf0fff':
  hevc: Add NEON add_residual for bitdepth 10
Merged-by: James Almer <jamrial@gmail.com>

* commit '81a4cb8e':
  vf_hwmap: Add reverse mapping for hardware frames
  vf_hwmap: Add device derivation
  hwcontext: Improve allocation in derived contexts
  hwcontext_qsv: Implement mapping frames to the child device type
  hwcontext_qsv: Implement mapping frames from the child device type
  hwcontext: Add frame context mapping for nontrivial contexts
  hwcontext_qsv: Support derivation from child devices
  avconv: Support setting the hardware device to use when filtering
  avconv_hw: Add implicit device creation with default parameters
  vp9_raw_reorder_bsf: Remove a redundant allocation

This commit is a noop, see
49419925
06043cc0
7ce47090
045ff8d3
ec3dbeae
f82ace71
a97fb144
d59c6a3a
b2ef1f42
d81be0a6Merged-by: James Almer <jamrial@gmail.com>

* commit '831018b0':
  mpeg4audio: Make avpriv_copy_pce_data() inline
Merged-by: James Almer <jamrial@gmail.com>

* commit 'e1c2453a':
  arm: hevc_idct: Tune the add_res_8x8 and add_res_32x32 functions
Merged-by: James Almer <jamrial@gmail.com>

* commit '0d4d4351':
  hevc: Add NEON add_residual for bitdepth 8

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

Replace generic with block size specific function.
Load the specific destination bytes instead of MSA load and pack.
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>

Fixes: runtime error: signed integer overflow: 623487 * 536870912 cannot be represented in type 'int'
Fixes: 3594/clusterfuzz-testcase-minimized-4650622935629824

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

Fixes: runtime error: signed integer overflow: -2110708110 + -82837504 cannot be represented in type 'int'
Fixes: 3547/clusterfuzz-testcase-minimized-6009386439802880

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

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

* commit '970c76f3':
  mlp_parser: Drop in-parser downmix functionality
Merged-by: James Almer <jamrial@gmail.com>

* commit 'dd3aa85b':
  aac_ac3_parser: Drop in-parser downmix functionality
Merged-by: James Almer <jamrial@gmail.com>

* commit 'c7bf98d4':
  avprobe: use av_spherical_projection_name() to print spherical projection names
  dump: use av_spherical_projection_name() to print spherical projection names
  spherical: add functions to retrieve and request projection names

This commit is a noop, see
9033e872
2efb70c3
2a2854f5Merged-by: James Almer <jamrial@gmail.com>

* commit '7acb9033':
  vaapi: Add external control of allow-profile-mismatch
  lavc: Add flag to allow profile mismatch with hardware decoding
  vaapi_encode: Use gop_size consistently in RC parameters

This commit is a noop, see
b658b539
49ae8a5e
38820631Merged-by: James Almer <jamrial@gmail.com>

* commit '85c2bf9d':
  avfoundation: update to use AVCodecParameters

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

* commit '94c54d97':
  mlp: Factor out channel layout subset checks
Merged-by: James Almer <jamrial@gmail.com>

* commit 'cea7fd9a':
  mlp: Drop ff_ prefix from a static function
Merged-by: James Almer <jamrial@gmail.com>

* commit '1f6e5dd4':
  mlp: Rename the channel layout variable
Merged-by: James Almer <jamrial@gmail.com>

* commit 'bee89ed3':
  matroskaenc: don't warn about unknown spherical metadata when there isn't any

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

* commit '04b0f0e3':
  mem: uninline av_malloc(z)_array()
Merged-by: James Almer <jamrial@gmail.com>

* commit '3d69dd65':
  hevc: Add support for bitdepth 10 for IDCT DC
Merged-by: James Almer <jamrial@gmail.com>

* commit '358adef0':
  hevc: Add NEON IDCT DC functions for bitdepth 8

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

* commit 'd0ce0634':
  clearvideo: 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>

* commit '189157c3':
  Add ClearVideo decoder

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

* commit 'c55f2ae2':
  avprobe: Handle unknown values for the color description

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

Make it clear that these are deprecated and the new API should be
used instead.

As a side effect, this slightly reduces differences with libav.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

* commit 'b812db66':
  utvideodec: Fix gradient prediction when stride does not match width

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

* commit '7c25523c':
  utvideodec: Fix decoding odd sizes with interlaced video with some formats

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

* commit '8c0cadd1':
  avplay: Do not try to allocate new frames when the player is closing
Merged-by: James Almer <jamrial@gmail.com>

* commit '41262498':
  configure: Fix sem_timedwait probe

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

* commit '44aafa33':
  configure: Properly escape arguments in filter/filter_out helper functions
Merged-by: James Almer <jamrial@gmail.com>

* commit '3889dfde':
  dca: Move the downmix request check outside the loop

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

* commit '2e1ab6a6':
  vc1dec: raise an error if sprite picture data is missing

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

* commit 'ecc5c4db':
  doc/examples/output: Cast pointer to the right (const) type
Merged-by: James Almer <jamrial@gmail.com>

* commit 'f25609ff':
  doc/examples/filter_audio: const correctness
Merged-by: James Almer <jamrial@gmail.com>

* commit '0fd0d4fd':
  swscale-test: const correctness
Merged-by: James Almer <jamrial@gmail.com>

Fixes compilation broken in 2245476eSigned-off-by: James Almer <jamrial@gmail.com>