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

Fixes compilation broken in 2245476e

Fixes ticket #6791
Signed-off-by: James Almer <jamrial@gmail.com>

Fixes build with old nasm/yasm.
Signed-off-by: James Almer <jamrial@gmail.com>

If the get_buffer() call fails, the frame might have some side data
already set. Make sure it gets freed.

Merges Libav commit de776714.
Signed-off-by: James Almer <jamrial@gmail.com>

In the is_mjpeg case, the user's get_buffer2 callback is not called,
thus completely breaking the API.
Signed-off-by: James Almer <jamrial@gmail.com>

Subtract the calculated dts offset from the requested timestamp before
seeking. This fixes an error "Error while filtering: Operation not
permitted" observed with a short file which contains only one key frame
and starts with negative timestamps.

Then, av_index_search_timestamp() returns a valid negative timestamp,
but mov_seek_stream bails out with AVERROR_INVALIDDATA.

Fixes ticket #6139.
Signed-off-by: Jonas Licht <jonas.licht@fem.tu-ilmenau.de>
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

m4b is commonly used as extension for m4a audiobook files.
The format is exactly the same. The only thing that differs
is the extension.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes fate-mov-invalid-elst-entry-count on a ppc system.

Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Nicolas George <george@nsup.org>

Print a warning to let applicatios fix their use.
After a deprecation period, check with a low-level assert.
Also make the constraint explicit in the doxygen comment.
Signed-off-by: Nicolas George <george@nsup.org>

Signed-off-by: Nicolas George <george@nsup.org>

Fixes: 1773/clusterfuzz-testcase-minimized-4832523987189760

Fixes: Timeout

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

Fixes: 1773/clusterfuzz-testcase-minimized-4832523987189760

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

Leads to setting of DefaultDuration in Matroska muxer based on frame rate instead of timebase.
Fixes playback in Chrome.
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

dashenc: Don't output frameRates at both AS and Representation-level. Only output maxFrameRate at AS-level.

Fix conformance regarding section "3.2.4. Presence of Attributes and
Element" of the "Guidelines for Implementation: DASH-IF Interoperability
Points V4.1" (http://dashif.org/guidelines/)
Signed-off-by: Anton Schubert <ischluff@mailbox.org>
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>