diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 04:43:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 04:43:12 +0100 |
| commit | 8a91da9575dd54fca6f411f28b5f0847a39d0bff (patch) | |
| tree | 7e570ecd134fcb5dd4b49fb54f14c597e9ca0ee3 /libavcodec/s3tc.h | |
| parent | 4c1da0d11e03ba0612a596cc62566321ad088319 (diff) | |
| parent | e5d403720ec4914169f55913a5a5555d908500b6 (diff) | |
| download | ffmpeg-8a91da9575dd54fca6f411f28b5f0847a39d0bff.tar.gz | |
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>
Diffstat (limited to 'libavcodec/s3tc.h')
| -rw-r--r-- | libavcodec/s3tc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/s3tc.h b/libavcodec/s3tc.h index 4378bd9483..2d77b3abe3 100644 --- a/libavcodec/s3tc.h +++ b/libavcodec/s3tc.h @@ -24,6 +24,8 @@ #include <stdint.h> +#include "bytestream.h" + #define FF_S3TC_DXT1 0x31545844 #define FF_S3TC_DXT3 0x33545844 |