Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Oct 2012 10:16:08 +0000 (12:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Oct 2012 10:16:08 +0000 (12:16 +0200)
commit3777e6b3bf65be9a925187a9d008c5d422fe17b5
tree6ab9a542129dd1bb6ac4ff6b572d714d1dba40c3
parent9317b73f11c34e550a2ffcf01540824dbaa36036
parentb93e934aeea44f3e92f0acd960e5d10151f14379
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
  fate: list lavfi tests in a makefile

Conflicts:
configure
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/mips/mathops.h
tests/Makefile
tests/fate/avfilter.mak