Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Mar 2012 03:43:12 +0000 (04:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Mar 2012 03:43:12 +0000 (04:43 +0100)
commit8a91da9575dd54fca6f411f28b5f0847a39d0bff
tree7e570ecd134fcb5dd4b49fb54f14c597e9ca0ee3
parent4c1da0d11e03ba0612a596cc62566321ad088319
parente5d403720ec4914169f55913a5a5555d908500b6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: K&R formatting cosmetics
  s3tc.h: Add missing #include to fix standalone header compilation.
  FATE: add capability for audio encode/decode tests with fuzzy psnr comparison
  FATE: allow a tolerance in the size comparison in do_tiny_psnr()
  FATE: use absolute difference from a target value in do_tiny_psnr()
  FATE: allow tests to set CMP_SHIFT to pass to tiny_psnr
  FATE: use $fuzz directly in do_tiny_psnr() instead of passing it around

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/s3tc.h
tests/Makefile
tests/fate-run.sh