• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8a91da95
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8a91da95
s3tc.h 1.78 KB