* commit 'b727b0ee':
  fate: Add tests for DSS

Conflicts:
	tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '062cd5a9':
  lavf: Add DSS demuxer

Conflicts:
	libavformat/Makefile
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c56b9b1e':
  lavc: Add DSS SP decoder

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

* commit '0fbb2713':
  qsv_api: fix building with libmfx disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '11c22dfd':
  configure: add missing h264_qsv hwaccel deps
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4e08c821':
  lavc: add an Intel libmfx-based H.264 decoder

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '31d2039c':
  h264_parser: export video format and dimensions

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

* commit '5b1d9cee':
  pixfmt: add a pixel format for QSV hwaccel

Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

* cigaes/master:
  doc/faq: explain DAR/SAR preserving.
  doc: set documentencoding on toplevel texi files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mov: Add simple ACLR atom reading to set the color range of the incomming track for codec's like DNxHD that utilise AVID's proprietary atom.

On input ACLR will be used to set colour range no matter which codec
it is associated with.
No change for when it will be output.

Rework mov_read_extradata function to allow detection of truncated
atom reads by callers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.

Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.

(or 32k to 256k in 32-bit)

This is similar to a00bab34

* commit '0f532fd3':
  rv40: Return more meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

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

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

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

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

* commit 'd617e77c':
  libx265: Add crf private option

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

* commit '2de887e4':
  libx265: Reduce the scope of some variables

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

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

Fixes CID1270820
Fixes CID1270818

Fixes CID1270819