* commit '8bdbf49c':
  rtpdec_h264: Include the right header for AV_RB16
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ba2e0790':
  rtpdec_vp8: Set the keyframe flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

Missed this hunk in first commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

This fixes a regression in 9fbc613fSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

Including libavcodec/get_bits.h is superfluous for AV_RB16 - nothing
in this file uses any actual bitstream reader.
Signed-off-by: Martin Storsjö <martin@martin.st>

This allows the output to be used with stream copy, which discards
packet from the start until the first keyframe.
Signed-off-by: Martin Storsjö <martin@martin.st>

Also add a 2nd maintainer at the authors request (due to lack of time)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Its only used in one function, having it in the context serves no purpose.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd

ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg,
when outputting DNxHD due to the incorrect padding placement. Now we add the
padding in the correct place

Tidy up FATE changes due to padding changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes reading uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Also check the combined_pitch for validity (which is needed to keep the behavior
identical in the error case)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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 writing uninitialized values into metadata without error in case
parsing fails
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* 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>