* commit 'aaab192d':
  af_volume: implement replaygain clipping prevention

Conflicts:
	doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ac976ed9':
  lavr: allocate the resampling buffer with a positive size
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '13164e47':
  FATE: add tests for more resampling modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f7c5fd81':
  resample: implement flushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Videos with complex typesetting usually have font files embedded
as attachment streams. vf_subtitles now finds all attachment
streams with a MIME type associated with fonts and loads them
to libass so it can use them for rendering.

The code was basically ported from mpv's loadfile.c@929793be7
Signed-off-by: Facundo Gaich <facugaich@gmail.com>

This adds a new "replaygain_noclip" option to the filter, and, if enabled,
limits the gain applied for tracks where clipping would occur.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

This fixes cases where very few input samples (fewer than needed for one
output sample) are passed to lavr at the beginning.
CC:libav-stable@libav.org

class is reserved keyword in C++ and compilator complains about that variable.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '801c39e1':
  dcadec: Use correct channel count in stereo downmix check

Conflicts:
	libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c8cf461c':
  dcadec: Do not decode the XCh extension when downmixing to stereo

Conflicts:
	libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e75ef2b7':
  tiffdec: support predictor type 2 with RGB48 pixel format

Conflicts:
	libavcodec/tiff.c

See: 72381b2bMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '345a96c3':
  tiffdec: remove an unneeded variable

Conflicts:
	libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a9b046fb':
  tiff: use a better name and enum values for PhotometricInterpretation

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fdbe18b7':
  tiffdec: use a single strip if RowsPerStrip is 0

Conflicts:
	libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0a467a9b':
  tiffdec: use bytestream2 to simplify overread/overwrite protection

Conflicts:
	libavcodec/tiff.c

See: 1ec83d9aMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5748faf2':
  bytestream: add bytestream2_copy_buffer() functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'de9d2705':
  bytestream: add functions for accessing size of buffer

See: 0ee5be4eMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '58bc38a5':
  tiffdec: use correct data type for palette entries and set alpha to 0xFF

Conflicts:
	libavcodec/tiff.c

See: dbfdb288Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bf2064f0':
  tiffdec: rename variables for consistency and fix variable shadowing

Conflicts:
	libavcodec/tiff.c

See: 251345a3Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd9a542ac':
  swscale: Set alpha to opaque for internal palettes.

Conflicts:
	libswscale/swscale_unscaled.c

See: dbfdb288Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '20c38c9c':
  swscale: fix some undefined signed left shifts

Conflicts:
	libswscale/swscale_unscaled.c

See: 7a32ab5eMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '60c4660b':
  swscale: fix an implementation-defined unsigned-to-signed conversion

Conflicts:
	libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* lukaszmluki/master:
  lavd/qtkit: add device category
  lavd/fbdev_enc: implement get_device_list
  lavd: no default device unless explicitly set
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd4a8a86c':
  doc: Libavfilter English cleanup

Conflicts:
	doc/filters.texi
	doc/libavfilter.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

s->prim_channels is greater than num_core_channels
when an XCh extension is present in the bitstream.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

This is neither necessary nor currently supported.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* commit '617a1a98':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
	libavformat/mp3enc.c

See: 40176fc3
See: d62bf5d4
See: various others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Also add additional known values and log as missing features.

The spec does not specify that 0 is an error condition, and there
are samples which use 0 when the whole image is in one strip.

Based on a patch by Paul B Mahol <onemda@gmail.com>

CC:libav-stable@libav.org

This is basically an overread/overwrite-safe memcpy between a
GetByteContext and a PutByteContext.

CC:libav-stable@libav.org

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

CC:libav-stable@libav.org

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>