* commit 'd961a79e':
  sbrdsp: move #if to disable all educational code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c829b35c':
  lavc: er: remove unused variable size

No change as the variable is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

pshuf+paddd is slightly faster than phaddd.
The real gain is in pre-ssse3 processors like AMD K8 and K10, which get
a big boost in performance compared to the mmxext version
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  svq3: directly set pix_fmt and color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ca80e158':
  mpegts: Forward error codes in various functions

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

* commit '86ba2327':
  mpegts: K&R formatting cosmetics

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

Avoids a warning of the unused function 'autocorrelate'.

The code using it was removed in d66e305b.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

* cehoyos/master:
  Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This is a bit tricky, we allocate a correctly sized AVFrame but then only
copy the compile time AVFrame size, this is to ensure that user applications
which do not use the correct av frame API dont end with out of array reads.
Note, applications using the correct API have set extended_data and the
changed code will never be executed for them.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows running more fate tests on remote targets
without the source tree.

Replace mulps+subps with fnmaddps, resulting in two less instructions inside the
inner loops.
About 1% faster FMA3 performance.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This also moves mov_rewrite_dvd_sub_extradata() to mov.c

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

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

Fixes regression with NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids the 2nd buffer and fixes the palette truncated check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  libx264: check color_range

Conflicts:
	libavcodec/libx264.c

See: 48d39c87Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bf0d7da7':
  ljpeg: check color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2183432e':
  mdec: set color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1c1fbc70':
  mjpeg: set color_range

Conflicts:
	libavcodec/mjpegdec.c

See: 2f870e26Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6612a03d':
  fraps: set color_range

Conflicts:
	libavcodec/fraps.c

See: 79f452f4Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5b1b91cf':
  tiff: Support rgba encoding

Conflicts:
	libavcodec/tiffenc.c

See: d7fc1006Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6d78e852':
  img2: add j2c file extension

Conflicts:
	libavformat/img2enc.c

See: e8df1827Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '58c21596':
  raw, nut: Support rgba64 encoding

Conflicts:
	libavcodec/raw.c
	libavformat/nut.c

See: edf34c34Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cccac765':
  png: Support rgb48 and rgba64 encoding

Conflicts:
	libavcodec/pngenc.c

See: f94ce3bcMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c598b569':
  png: K&R formatting cosmetics

Conflicts:
	libavcodec/png.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f7518f1a':
  codec_desc: update dvaudio tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6d7b22fb':
  isom: fix C99-style declaration

See: cd0982e1Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1481d24c':
  RGBA64 pixel formats

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/utils.c

See: 9569a3c9
See: 92afb431, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd24e9a99':
  h264 does not depend on mpegvideo any more
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '7245a0ae':
  mpegvideo: remove h264-only fields

Conflicts:
	libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>