* qatar/master:
  aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).

Conflicts:
	Changelog
	libavcodec/aacdec.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f457edb6':
  aacdec: Use avpriv_report_missing_feature() instead of custom logging.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b1fcdc08':
  nut: Fix unchecked allocations

Conflicts:
	libavformat/nut.c
	libavformat/nutdec.c
	libavformat/nutenc.c

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

* commit '3511d4fc':
  pthread: Avoid crashes/odd behavior caused by spurious wakeups

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

This does not include support for LD SBR, epTool, data resilience, nor
the 960 transform family.

This also fixes the code so it decodes raw images correctly again
No release is affected by this

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

cherry picked from commit b971f2c8fdc60f8bab605a6e8060492eb548a53a
cherry picked from commit e57b0a2c915ce6b8a9d57b8292f6581f0680842e
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

cherry picked from commit c7765f3295fe7dc0653161c6a3d3e1778b76ee67
cherry picked from commit 0008c4979fc1d1bc24d4d2c791715f6dd017563c

Conflicts:

	libavcodec/utils.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  fate: add fieldorder filter test
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '00d7369d':
  vf_fieldorder: log when processing is skipped
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '103d073d':
  h264_parser: Use ff_h264_reset_sei()

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

* commit '19f53840':
  h264_parser: Fix order of operations

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

* commit 'f825d42b':
  avplay: Accept cpuflags option

Conflicts:
	cmdutils_common_opts.h
	doc/ffmpeg.texi
	doc/fftools-common-opts.texi
	ffmpeg_opt.c

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

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

CC: libav-stable@libav.org
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This is similar to 5152196b.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This is similar to 5152196b.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Avoids FPE on alpha
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Quite useful for debugging.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

hevc: fix transform_skip which is only valid for 4x4(cherry picked from commit 740e5a71e5121dbf3fabdc4fec97829c18ecc2d8)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	libavcodec/hevc.h
	libavcodec/hevc_filter.c
	libavcodec/hevc_refs.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

hevc: cleaning disable field in deblocking filter(cherry picked from commit 7dd7a27ae850a51b3c9cd07046c422677398f6d5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* cigaes/master:
  lavf/tee: fix leak of bsfs array.
  lavf/tee: fix leak of select option.
  lavf/tee: fix leak of strdup/strtoked buffer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* qatar/master:
  avio: Use AVERROR_PROTOCOL_NOT_FOUND

Conflicts:
	libavformat/avio.c

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

* commit '5152196b':
  pthread: Avoid spurious wakeups

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

* commit '23e6d3d4':
  fate: vpx: Remove one redundant $(eval) invocation

Merge for meta data only as this breaks the affected fate tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>