* commit '9f4c7397':
  hevc: check slice address length

See: 05cc8c8eMerged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'a9a2f361':
  doc: add a section about building with libmfx

Conflicts:
	doc/general.texi
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '86eee85d':
  bytestream2: set the reader to the end when reading more than available
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '8bc67ec2':
  Checkasm: assembly testing and benchmarking tool
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes Ticket4546
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>

This also prevents an eventual compilation failure once request_channels
is removed.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

It is used as get_bits argument and reading 0 bits doesn't make sense.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

This prevents possible infinite loops with the calling code along the
lines of while (bytestream2_get_bytes_left()) { ... }, where the reader
does not advance.

CC: libav-stable@libav.org

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

It provides the following features:
 * verify correctness by comparing output to the C version.
 * detect failure to save and restore clobbered callee-saved registers.
 * detect 32-bit parameters being used as if they were 64-bit in x86-64
   (the upper halves are not guaranteed to be zero - but in practice
   they very often are, which makes those bugs hard to spot otherwise).
 * easy benchmarking.

Compile by running 'make checkasm'.
Execute by running 'tests/checkasm/checkasm'.

Optional arguments are '--bench' to run benchmarks for all functions,
'--bench=<pattern>' to run benchmarks for all functions that starts with
<pattern>, and '<integer>' to seed the PRNG for reproducible results.

Contains unit tests for most h264pred functions to get started, more tests
can be added afterwards using those as a reference.

Loosely based on code from x264. Currently only supports x86 and x86-64,
but additional architectures shouldn't be too much of an obstacle to add.

Note that functions with floating point parameters or floating point
return values are not supported. Some compiler-specific features or
preprocessor hacks would likely be required to add support for that.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

* commit '79626865':
  asfdec: always reset packet state after seeking
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'f1bdc234':
  riff: Validate bitrate

Conflicts:
	libavformat/riffdec.c

See: 189420cbMerged-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'c1d647b1':
  mp3: Make the seek more robust

Conflicts:
	libavformat/mp3dec.c

Mostly not merged

See: b6267901 and various later commits

The bug is also not reproducable in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'd80811c9':
  riff: Use the correct logging context

Conflicts:
	libavformat/asfdec_o.c
	libavformat/avidec.c
	libavformat/dxa.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/riff.h
	libavformat/riffdec.c
	libavformat/wavdec.c
	libavformat/wtvdec.c
	libavformat/xwma.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '355864ef':
  g726: Do not crash on user mistake
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

At the beginning, the value is not initialized.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Fixes "libavformat/brstm.c:128:35: warning: variable info_size set but not used"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

based on code from libavutil/mem.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This makes the output compatible with that of pretty much any other
tool that calculates PSNR.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Try to parse up to 4 packets to find the closest packet.

Reported-By: jan.schlueter@ofai.at

Properly report the sample rate as invalid

CC: libav-stable@libav.org

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '87f98a2b':
  fbdev: Support the RGB565 colour space.

Conflicts:
	libavdevice/fbdev_dec.c

See: 43d36599Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Tested on a Raspberry Pi.
Signed-off-by: Martin Storsjö <martin@martin.st>