* qatar/master:
  dcadec: Decode LFE to avoid adding random data when downmixing with LFE

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

This avoids collecting statistics for rfps values that very likely
will get rejected later.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

it makes no sense for other streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

makes the first call to sws_getContext() 1ms faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

this safes about 0.1ms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

These occur when no context is set for example, thus they are common
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

about 1/3 or so faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Should fix issues compiling lavr's Windows resource file.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* lukaszmluki/master:
  lavd/fbdev_enc: add default device
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Since we don't write lavf's string when bitexact is requested, this will
prevent the tag from being copied from the source stream.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Use device specified by environment variable FRAMEBUFFER or /dev/fb0 as default.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

avcodec/error_resilience: check that er is supported before attempting to read the status of the previous slice

Fixes incorrectly set error_occured and improves speed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

about 1ms faster startup time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This reduces the amount of duplicated code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  webp: add a special case for a huffman table with only 1 symbol
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f51e3a19':
  webp: do not call av_frame_free() on the user-provided frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b73a8922':
  ljpegenc: split yuv encoding into a separate function

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

* commit 'fa447681':
  ljpegenc: split bgr encoding into a separate function

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

* commit 'daffed3b':
  ljpegenc: accept bgr24 instead of bgra

Conflicts:
	libavcodec/ljpegenc.c
	libavcodec/mjpegenc.c

Only whitespace merged, we continue to support both formats
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0cdbc4d3':
  ljpegenc: rename the encoding function.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '72c0b8f7':
  ljpeg: remove a commented-out line
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '24abd806':
  ljpegenc: deMpegEncContextize

Conflicts:
	libavcodec/ljpegenc.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	tests/ref/vsynth/vsynth1-ljpeg
	tests/ref/vsynth/vsynth2-ljpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This avoids a use of MpegEncContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This will be used by ljpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '86eb2eaa':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()

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

* commit '3360ad99':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()

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

* commit '058d5f2f':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()

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

The file now contains both source and filter, the new name looks more
appropriate.

Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.

Replace the inline awk script with a Perl script which tracks the
dependencies recursively.

This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).

This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.

This is a variant of commit 628ceac6
which was reverted due to out-of-tree build failure.