* commit '8837f439':
  libopencore-amrwb: Make AMR-WB ifdeffery more precise
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e6bda9a9':
  libopencore-amr: Conditionally compile decoder and encoder bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '56632fef':
  libopencore-amrnb: cosmetics: Group all encoder-related code together
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0b70fb1d':
  dsputil: convert remaining op_pixels_func

No changes to the code as all these fixes already existed in FFmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '488f87be':
  roqvideodec: check dimensions validity
  vqavideo: check chunk sizes before reading chunks
  qdm2: check array index before use, fix out of array accesses

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

Instead, keep them in the bitstream buffer until we read them verbatim,
this saves a memcpy() and a subsequent clearing of the target buffer.
decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from
6121.4 to 6095.5 cycles, i.e. 26 cycles faster.
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>

This fixes an assertion failure when running mplayer -vc ffh264vdpau.

Reported by irc user ioni.

Some applications do not like that.
Fixes VDA
Reduces noise for VDPAU
Tested-by: Guillaume POIRIER <poirierg@gmail.com>
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit 620b88a3.

Fixes ticket #2272.

Conflicts:
	libavformat/swfenc.c

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

This allows printing values via av_log from expressions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes lavc compilation (linking) for configurations without fft.

Reported-by: tyler wear
Tested-by: Gavin Kinsey

The size of the AVFrame structure is not part of the ABI;
it can grow with later versions. Therefore, applications
are not supposed to allocate AVFrame directly, they are
supposed to use avcodec_alloc_frame() instead.

* qatar/master:
  error_resilience: add required headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Set odd size for unsharp matrices, even values are not accepted.

The library might provide an encoder in the future, so it's better to
check for the presence of the decoder rather than just the library.

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

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

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

Convert to diffptr_t the line_size parameters still int.

Remove all the warnings in dsputil.c

The filter has been natively integrated into libavfilter.

The native filter is equivalent from the point of view of the features
and of performances.

Increase performance, to match mp=unsharp.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3ae61045)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fee26d352a52eb9f7fcd8d9167fb4a5ba015b612)

CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>