img2: Add j2k file extension for JPEG 2000

Signed-off-by: Diego Biurrun <diego@biurrun.de>
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values

Signed-off-by: Diego Biurrun <diego@biurrun.de>
libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'

* commit '8c65264595d5a82c56ae5043320e4b875a414229':
  pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
  img2: Add j2k file extension for JPEG 2000

Conflicts:
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters: fix old broken syntax of color source in overlay example

Found-By: littlebat <dashing.meng@gmail.com>
doc/filters: clarify example explanation
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames

Conflicts:
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tty: make use of AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tty: make use of AV_OPT_TYPE_IMAGE_SIZE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
x264asm: fix cmp* number of arguments

cmp{p,s}{s,d} instructions do take an imm8 operand.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
x86: sbrdsp: implement SSE neg_odd_64

Timing on Arrandale:
        C   SSE
Win32:  57   44
Win64:  47   38
Unrolling and not storing mask both save some cycles.

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