* commit '5352802d':
  dca: Account for lfe when checking for the channel count

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

* commit '37f57354':
  swscale: Convert the check check_image_pointers helper to a macro

[14:52:50] <jamrial> michaelni, ubitux: 37f57354 yay or nay? we don't have the warnings mentioned there because we cast the argument
[14:54:10] <@ubitux> i don't really see the improvement, no opinion
[15:04:14] <michaelni> jamrial, functions are better/cleaner than macros
[15:04:20] <michaelni> IMHO that is

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

* commit 'f56fa95c':
  swscale: Do not shift negative values directly

14:30:21] <jamrial> michaelni: do you prefer how f56fa95c (libav) handles left shift of negative value, or how we're currently doing it?
[14:30:31] <jamrial> ours is cleaner looking, IMO
[14:30:57] <@ubitux> i agree
[14:31:13] <@ubitux> if we didn't forget any, i think this commit is better noop'ed
[14:31:57] <jamrial> ubitux: we even have a bunch of other cases this commit doesn't handle that i'd have to manually change, so yeah, i'm leaning towards nooping it
[14:34:04] <michaelni> jamrial, +1, ours as its cleaner

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

* commit '378460fe':
  utvideodec: Support for gradient prediction
  utvideodec: Reuse the huffyuv add_left
  utvideodec: Support ULY4 and ULH4
  utvideodec: Support UQRA and UQRG
  swscale: Add gbrap10 output
  swscale: Add input support for gbrap10 pixel format
  pixfmt: Add gbrap10 pixel format
  utvideodec: Support UQY2

This commit is a noop, see
115e63c8
8100426f
9d30690f
b828788d
84efdabc
c62cb9bf
ea93052d
faa94a57Merged-by: James Almer <jamrial@gmail.com>

* commit '9e4a5eb5':
  avformat: Free the internal codec context at the end
Merged-by: James Almer <jamrial@gmail.com>

* commit '19c5fa9e':
  golomb: Simplify get_ur_golomb_jpegls

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.htmlMerged-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: Paul B Mahol <onemda@gmail.com>

This patch enables paletteuse to identify the transparency in incoming
video and tag transparent pixels on outgoing video with the correct
index from the palette.

This requires tracking the transparency index in the palette,
establishing an alpha threshold below which a pixel is considered
transparent and above which the pixel is considered opaque, and
additional changes to track the alpha value throughout the conversion
process.

This change is a partial fix for https://trac.ffmpeg.org/ticket/4443
However, animated GIFs are still output incorrectly due to a bug
in gif optimization which does not correctly handle transparency.
Signed-off-by: Clément Bœsch <u@pkh.me>

Fixes ticket #6779.

* commit '1fe85813':
  utvideodec: Prevent possible signed overflow

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

* commit '4d4d7cf9':
  fmvc: Add FATE tests
Merged-by: James Almer <jamrial@gmail.com>

* commit '95a8a03a':
  Add FM Screen Capture Codec decoder
Merged-by: James Almer <jamrial@gmail.com>

* commit '89d9869d':
  hevc: Add NEON 16x16 IDCT
Merged-by: James Almer <jamrial@gmail.com>

* commit '50a1c66c':
  ac3_parser: add a public function for parsing the data required by the demuxer

avpriv_ac3_parse_header() is left in place but without the
GetBitContext parameter, as the mov muxer requires a lot more fields
than just bitstream_id and frame_size from the AC3HeaderInfo struct.
Merged-by: James Almer <jamrial@gmail.com>

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

Signed-off-by: Marton Balint <cus@passwd.hu>

merge from libav: 585dc1ae

If the metadata packet is corrupted, flv_read_metabody can accidentally
read past the start of the next packet. If the start of the  next packet
had been flushed out of the IO buffer, we would be unable to seek to
the right position (on a nonseekable stream).

Prefer to clearly error out instead of silently  trying to read from a
desynced stream which will only be interpreted as garbage.

This reverts commit ef7fe81b.

Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

Deprecated since October 2015.

* commit '193b0918':
  thread: Define ff_mutex_* macros as stub functions when threads are disabled
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b200a2c8':
  examples: Fixed and extended Doxygen documentation
Merged-by: James Almer <jamrial@gmail.com>

* commit 'efddf2c0':
  decode: Initialize ret before using it
  filtfmts-test: Mark filter as const

This commit is a noop, see
3c14547e
960b4d47Merged-by: James Almer <jamrial@gmail.com>

* commit 'f5950b8f':
  lavfi: Drop unused and empty header file
Merged-by: James Almer <jamrial@gmail.com>

* commit 'd32d59bc':
  matroska: Read only the data written in the scratch buffer

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

* commit '6ac0e781':
  mpeg4videodec: raise an error if sprite_trajectory.table is NULL
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b62ed687':
  configure: Better names for functions that sanitize input
Merged-by: James Almer <jamrial@gmail.com>

id3v2 code is compiled unconditionally and uses zlib when available.
Signed-off-by: James Almer <jamrial@gmail.com>

* commit '604fbb31':
  mov: Move code shared with CAF to a separate file
Merged-by: James Almer <jamrial@gmail.com>