* commit 'e3d4784e':
  d3d11va: WindowsPhone requires a mutex around ID3D11VideoContext
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

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

* commit '781a25e9':
  checkasm: v210: Fix array overwrite
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '4a664224':
  pixfmt: Add new SMPTE color primaries and transfer characteristic values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '77788598':
  dcadec: set channel layout in a separate function
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '971177f7':
  dcadec: scan for extensions in a separate function
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '22cc57da':
  rtpdec: Forward the memory failure
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Appeared in ITU-T Rec H.265 10/2014.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

This reverts commit 27cbe458.

See
https://lists.ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179002.htmlRequested-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>

This patch refactors the AAC coders to reuse code
between the MIPS port and the regular, portable C code.
There were two main functions that had to use
hand-optimized versions of quantization code:
 - search_for_quantizers_twoloop
 - codebook_trellis_rate

Those two were split into their own template header
files so they can be inlined inside both the MIPS port
and the generic code. In each context, they'll link
to their specialized implementations, and thus be
optimized by the compiler.

This approach I believe is better than maintaining
several copies of each function. As past experience has
proven, having to keep those in sync was error prone.
In this way, they will remain in sync by default.

Also, an implementation of the dequantized output
argument for the optimized quantize_and_encode
functions is included in the patch. While the current
implementation of search_for_pred still isn't using
it, future iterations of main prediction probably will.
It should not imply any measurable performance hit while
not being used.

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

Failing earlier causes the context to be insufficiently initialized which
can break decoding future frames with threads
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

gamma_convert is only used with the old code. Thus, it is
placed under a header guard. This patch silences a -Wunused-function
observed on GCC 5.2.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

Silences a -Wunused-variable and -Wunused-function observed under GCC 5.2.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

lpd.buf is non-const and discards the const qualifier of zerobuffer.
This fixes -Wdiscarded-qualifiers observed with GCC 5.2.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>

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

to make dca_decode_frame more readable
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

And avoid a memory leak.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

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

* commit '1ec611a1':
  rtsp: warning when max_delay reached
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd555bd69':
  rtpdec: inform jitter buffer size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'ff7f6ea9':
  rtpdec: add a trace when jitter buffer is full
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '3c525b8b':
  rtpdec: Increase the max size of the jitter buffer to 500 packets
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '570fcaf3':
  jpeg2000: Factor out prec init
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Reported and tested by Andy Furniss, adf d lists at gmail

* commit '95a41311':
  jpeg2000: Factor out band stepsize initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7fb93eae':
  jpeg2000: Factor out band initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '1b709f23':
  jpeg2000: Refactor decode_packets

Not merged, as the ffmpeg code is much more advanced.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '29b00f88':
  jpeg2000: Templatize the frame writer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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