* commit '2e2d2466':
  jpeg2000: Add mutlti-threading support to decoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>

    This should fix building with MSVC until someone can change the
    code so it works with MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also favor the video filter name for indexing, in case there is an a*
audio filter variant.

In particular, fix h/H commands in case h and H are not specified as
initial parameters.

* cehoyos/master:
  Read block_align from extradata when decoding qclp in aiff.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #1287.

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 should fix building with MSVC until someone can change the
code so it works with MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  x86: Move some conditional code around to avoid unused variable warnings

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '10f1a4d9':
  jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '94660c35':
  threads: always call thread_finish_setup for intra codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Flag added in a few simple filters. A bunch of other filters can likely
use the feature as well.

Fixes part of ticket 2004
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  avcodec: Bump minor for JPEG 2000 decoder
  JPEG 2000 decoder for DCinema

The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/mqc.c
	libavcodec/mqc.h
	libavcodec/mqcdec.c
	libavcodec/version.h
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '0c15a9aa':
  sh4: Remove dubious aligned dsputil code

Conflicts:
	libavcodec/sh4/dsputil_align.c
	libavcodec/sh4/h264chroma_init.c
	libavcodec/sh4/hpeldsp.c
	libavcodec/sh4/qpel.c

If someone wants to maintain the sh4 code in ffmpeg, wants to
add more optimizations, or volunteers to maintain any of
what is removed here and can confirm that they are faster.
Then please contact us!
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b4ad7c54':
  x86: cavs: Refactor duplicate dspfunc macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a0d5ca4f':
  mxfenc: Use correct printf format specifier for int64_t
  h264: Drop unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '78fa0bd0':
  x86: cavs: Put mmx-specific code into its own init function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Intra codecs do not need an update_thread_context() function and never
call ff_thread_finish_setup(). They rely on ff_thread_get_buffer()
calling it. So call it even if the get_buffer2 function pointer is
avcodec_default_get_buffer2 and it has not been called before.

Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

* qatar/master:
  x86: Remove some duplicate function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9bfc6e02':
  afifo: fix request_samples on the last frame in certain cases
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b845f5e9':
  riff: Factor out WAVEFORMATEX parsing

Conflicts:
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '516089d5':
  riff: Add ACTRAC3+ guid

No change, this commit was in ffmpeg already with this formating
Merged-by: Michael Niedermayer <michaelni@gmx.at>