* commit 'c9f8cfb6':
  fate: add checkasm target
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '82e6ac85':
  checkasm: test all architectures with optimisations
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'cb33f8d0':
  checkasm: Give macro a body to avoid potential unexpected syntax issues

See: a39512baMerged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '6cc4d3e9':
  checkasm: exit with status 0 instead of 1 if there are no tests to perform
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '256ef198':
  h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

Conflicts:
	libavcodec/arm/h264pred_init_arm.c

See: 565cabf5Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'fc568683':
  cosmetics: Reformat checkasm tests
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

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

* commit 'd37f2326':
  checkasm: Add unit tests for bswapdsp
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'a344e5d0':
  x86: bswapdsp: Don't treat 32-bit integers as 64-bit

Conflicts:
	libavcodec/x86/bswapdsp.asm
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'f5ee2300':
  configure: Factor out g722dsp module

Conflicts:
	configure
	libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'a623aa00':
  configure: Factor out wmv2dsp module

Conflicts:
	libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'd42191c7':
  configure: Factor out vp8dsp module

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'd4aea1aa':
  configure: Factor out vp56dsp module
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '5cb4bdb2':
  configure: Factor out rv34dsp module

Conflicts:
	libavcodec/Makefile
	libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

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

* commit '575ec60e':
  configure: Factor out mss34dsp module

Conflicts:
	libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '2edc77dc':
  configure: Factor out ividsp module
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'b075869b':
  configure: Factor out flacdsp module

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '4da585ae':
  OS/2: Cleanup slib_create_def_cmd

See: 22a0387dMerged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'e1319aa1':
  libx264: Add support for the MPEG2 encoder

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/libx264.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

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

Fixes: signal_sigabrt_7ffff70eccc9_498_divx502.avi with memlimit 1572864

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

The upper halves are not guaranteed to be zero in x86-64.

Also use `test` instead of `and` when the result isn't used for anything other
than as a branch condition, this allows some register moves to be eliminated.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* commit '0cf5588d':
  hq_hqa: Fix decoding when INFO section is absent
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'a5354084':
  APIchanges: Mention lavfi and lavd identification symbol addition

Conflicts:
	doc/APIchanges

No change as these symbols have been added a very long time ago to FFmpeg
and are already listed in APIchanges
Merged-by: Michael Niedermayer <michael@niedermayer.cc>